karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity
957 Commits 5 Branches 225 Tags
de9c3c94decf643867be25eccb21013aefb50e73
Commit Graph

13 Commits

Author SHA1 Message Date
Jimmy Shih 4741e674c4 merge heads 2011-10-28 09:52:24 -07:00
Jimmy Shih b6dcbb1377 merge heads 2011-10-27 18:13:04 -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 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
Rodrigo Damazio 44f53dabed Merge heads 2011-10-21 20:26:43 -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