Commit Graph

958 Commits

Author SHA1 Message Date
Jimmy Shih cc06c469ee fix comment on 87a508c1fb9b 2011-11-04 13:50:25 -07:00
Jimmy Shih de9c3c94de add translation descriptions for settings options 2011-10-28 16:23:45 -07:00
Jimmy Shih 730048c70b fix comments for e50bc8498bb2 2011-10-28 13:15:58 -07:00
Jimmy Shih 1637d2202c merge heads 2011-10-28 13:01:29 -07:00
Jimmy Shih c0a6850eff merge heads 2011-10-28 12:50:24 -07:00
Jimmy Shih 8f642ad112 fix a typo on a4dd967c8b26 2011-10-28 12:48:30 -07:00
Jimmy Shih 0b879eb5a0 fix comments for a4dd967c8b26 2011-10-28 12:43:36 -07:00
Jimmy Shih 4741e674c4 merge heads 2011-10-28 09:52:24 -07:00
Jimmy Shih d3ad49c4e1 merge heads 2011-10-27 18:59:10 -07:00
Jimmy Shih 3487da83ab slight wording changes on 8659ae7e6208 2011-10-27 18:53:53 -07:00
Jimmy Shih 3bc96bf319 merge heads 2011-10-27 18:47:05 -07:00
Jimmy Shih 3e22941484 fix comments on 425100d373ad 2011-10-27 18:35:25 -07:00
Jimmy Shih b6dcbb1377 merge heads 2011-10-27 18:13:04 -07:00
Jimmy Shih f6d99ba106 fix comment on 24401e81915f 2011-10-27 17:59:15 -07:00
Jimmy Shih 2bacc8d7b8 add translation_description 2011-10-27 13:21:14 -07:00
Jimmy Shih dfc5d61514 More translation_descriptions. 2011-10-26 18:04:49 -07:00
Jimmy Shih b2d989887d Add translation_description for status messages. 2011-10-26 16:00:49 -07:00
Jimmy Shih 0c72f1e5d3 add translation_descriptions for error messages 2011-10-26 14:19:14 -07:00
Jimmy Shih 58ce6d8a2c Add translation context for Sensor Options and Track Color Mode.
Convention:
Use "option" to indicate a display string like "sensor_type_option_ant".
Use "value" to indicate a stored value like "sensor_type_value_ant".

Additional proposals not in this changeset:
- rename "Sensor Options" to "Sensor"?
- rename "Track Color Mode" to "Track color"?
2011-10-26 10:41:33 -07:00
Jimmy Shih e7c0f3b5d0 Removing track_color_mode_none.
The default value for track_color_mode_options is
@string/none, not @string/track_color_mode_none.
See preferences.xml
2011-10-25 17:11:34 -07:00
Jimmy Shih c799f8d716 fix comments for 22e45d5be68c 2011-10-25 16:55:05 -07:00
Jimmy Shih fb036bfe4c Fix unit test errors in DocsHelper_AddTrackRowTest.java
DocsHelper_AddTrackRowTest is using a MockContext, which
cannot be used to call DateFormat.getDateFormat(context).

Refactor a getDisplayDate method in DocsHelper and allow the
test to override the method.

Also update .hgignore to AnnotationProcessor.log.
2011-10-25 15:02:03 -07:00
Jimmy Shih acfd522b57 Fix unit test failures:
Based on instruction from
http://android-mock.googlecode.com/files/AndroidMockinEclipse.pdf
- reference AndroidMockGenerator instead of AndroidMockRuntime
- name file as AnnotationProcessor.log
- in .factoryPath, upgrade to android-14
- in .factoryPath, add MyTracksLib jar

Verified that AnnotationProcessor.log contains no error.

Based on ADT14 changes:
http://code.google.com/p/android-mock/issues/detail?id=17#c0
change bin_dir location from "bin" to "bin/classes"
2011-10-25 14:26:07 -07:00
Jimmy Shih f16f7b08c8 merge heads 2011-10-25 11:50:06 -07:00
Jimmy Shih b06201d079 merge heads 2011-10-25 10:15:04 -07:00
Jimmy Shih 17ba5e6a48 Fix project dependencies.
- MyTrack app should export google-common.jar, common-logging-1.1.1.jar,
  protobuf-java-2.3.0-lite.jar and the MyTracksLib library.
- A test should only depend on its app. E.g., it should not need to
  reference the MyTracksLib library again.
2011-10-24 18:33:33 -07:00
hardillb b488ee5235 Added a comment to the track_id_broadcast_extra to note it should be deprecated and renamed in the next API refector 2011-10-24 23:00:35 +01:00
Jimmy Shih a012943119 - When there are two buttons, place the positive button on the left
and the negative button on the right to match the alert dialog.
- If an alert dialog only needs one button, assign it as the PostiveButton.
- If an alert dialog needs two buttons, assign one Positive and another
Negative.
- for CheckUnits, change the message to
  "Do you want to use metrics as your default units?" so that
  "yes" corresponds to the default case of using metrics as
  the default units.
2011-10-24 14:30:33 -07:00
hardillb 2afcd38bc5 Reuse track_id_broadcast_extra in MyTracksLib third_party.xml rather than add a new constant with the same value. 2011-10-24 10:32:35 +01:00
Jimmy Shih ef86905c58 Fix comment for 483b954b8878 2011-10-21 17:57:38 -07:00
Jimmy Shih 66f41ca1ae merge heads 2011-10-21 16:16:01 -07:00
Rodrigo Damazio 44f53dabed Merge heads 2011-10-21 20:26:43 -02:00
Jimmy Shih 2eee3c1c3e merge heads 2011-10-21 15:23:13 -07:00
Rodrigo Damazio ac652cbbd7 Also adding proper code formatting properties to signal strength projects. 2011-10-21 20:19:51 -02:00
Rodrigo Damazio de4a7be6a5 Fixing line length in project properties. 2011-10-21 20:07:36 -02:00
Jimmy Shih 5a3a2231c0 Fix classpath dependency on MyTracksLib
Move other projects to Android 4.0.
2011-10-21 14:19:46 -07:00
Jimmy Shih 8326d37806 merge heads 2011-10-21 13:50:19 -07:00
hardillb eb0ecadf31 Removed extra line added by accident 2011-10-21 19:45:16 +01:00
Jimmy Shih 661815ea1f Merge heads 2011-10-21 09:49:38 -07:00
Jimmy Shih e4f1ca83f9 merge heads 2011-10-20 18:07:10 -07:00
Jimmy Shih da2b9cb132 merge heads 2011-10-20 18:05:58 -07:00
Jimmy Shih 547e5a26ee Fix comment on 22e45d5be68c 2011-10-20 17:22:03 -07:00
Jimmy Shih 1068b64b74 Imrpove the layout style for all the Buttons on the bottom of a screen. 2011-10-20 17:13:39 -07:00
Jimmy Shih d8f6ed196e Add translation_description to prepare for translation.
Clean up menu items.
- change "Record track" to "Record Track"
- change "Stop recording" to "Stop Recording"
- remove "Delete all tracks", "Please select the track to view",
  "Current track", and "Last segment".
- move "Elevation" to the stat label section.
2011-10-20 15:56:45 -07:00
Rodrigo Damazio 9ebea2b040 Updating the My Tracks target to ICS (Android 4.0). 2011-10-20 20:52:28 -02:00
Rodrigo Damazio 0c41c36c0d Updating project to build with latest version of the ADT plugin and Android SDK.
The new version seems a bit quirky, if it has build problems try initially building one project at a time in the right order.
2011-10-20 20:50:16 -02:00
Rodrigo Damazio 1b1f3e3d8b Merging to head. 2011-10-20 20:03:43 -02:00
Rodrigo Damazio fe33982df7 Backing out unpushed ef8239961ed3 to merge with newest TrackDataHub. 2011-10-20 20:03:18 -02:00
Jimmy Shih 53804b6c80 Merge heads. 2011-10-20 09:52:46 -07:00
Jimmy Shih 5ce068b6fa Fix comments on 41a785ab72d4. 2011-10-19 17:23:05 -07:00