32bc71ae0f
merge heads
2011-11-07 09:27:10 -08:00
0cf39e94a2
Added 'Default Activity Type' function (Issue 519).
2011-11-07 15:02:40 +00:00
6ccb32c837
Clean up. Have ImportActivity call ImportAllTracks
2011-11-05 16:27:46 -07:00
c63763982a
fix comment b7f41a55cc69
2011-11-05 15:03:18 -07:00
c26e63dec3
merge heads
2011-11-05 12:08:14 -07:00
014e5257d0
merge heads
2011-11-05 11:50:27 -07:00
1911187450
fix comment on 90eb53c0b4bd
2011-11-05 11:44:19 -07:00
827e94b721
merge heads
2011-11-04 15:22:15 -07:00
fe9e6d47a2
fix comment on 78a330b32e6f
2011-11-04 15:04:15 -07:00
fe8cd0b884
merge heads
2011-11-04 14:30:35 -07:00
496e0c0862
fix comment on 9f9c8f7cfb29
2011-11-04 14:16:01 -07:00
f2c3673406
merge heads
2011-11-04 14:11:47 -07:00
8dd2ebd245
merge heads
2011-11-04 13:52:32 -07:00
cc06c469ee
fix comment on 87a508c1fb9b
2011-11-04 13:50:25 -07:00
96d8397787
fix typo on 4dcde424d9a9
2011-11-03 18:40:56 -07:00
20346091c3
fix a typo in 4dcde424d9a9
2011-11-03 18:32:48 -07:00
776f9bf360
Modify the check units flow so that it asks the user to pick either
...
metric or imperial. Metric is the default. Thus no longer need to
send the user to the 'Display' settings page.
2011-11-03 18:29:30 -07:00
d09218ca97
Fix the temp directory used by TempFileCleaner.
...
Previously, it missed 'MyTracks' in the directory path.
2011-11-03 14:21:30 -07:00
c4e8375ef6
merge heads
2011-11-02 11:39:14 -07:00
4e288e4b85
- remove arrays.xml
...
- clean up keys.xml
- clean up do_not_translate.xml
2011-11-01 11:34:33 -07:00
324d3f6ef1
Fix for ANT+ Sensor Manager Events Order Issue
2011-11-01 16:04:46 +11:00
e640d4280a
add translation description
2011-10-31 13:59:58 -07:00
3951f08531
should be been part of 78a330b32e6f
2011-10-31 11:21:34 -07:00
684546f080
add translation descriptionws
2011-10-31 11:18:55 -07:00
507ab6723c
merge heads
2011-10-31 09:41:15 -07:00
0f4483e2f8
add translation_description
2011-10-28 18:44:09 -07:00
de9c3c94de
add translation descriptions for settings options
2011-10-28 16:23:45 -07:00
730048c70b
fix comments for e50bc8498bb2
2011-10-28 13:15:58 -07:00
1637d2202c
merge heads
2011-10-28 13:01:29 -07:00
c0a6850eff
merge heads
2011-10-28 12:50:24 -07:00
8f642ad112
fix a typo on a4dd967c8b26
2011-10-28 12:48:30 -07:00
0b879eb5a0
fix comments for a4dd967c8b26
2011-10-28 12:43:36 -07:00
c1d4dd92cd
Fix eclipse warnings
2011-10-28 11:14:26 -07:00
4741e674c4
merge heads
2011-10-28 09:52:24 -07:00
d3ad49c4e1
merge heads
2011-10-27 18:59:10 -07:00
3487da83ab
slight wording changes on 8659ae7e6208
2011-10-27 18:53:53 -07:00
3bc96bf319
merge heads
2011-10-27 18:47:05 -07:00
3e22941484
fix comments on 425100d373ad
2011-10-27 18:35:25 -07:00
b6dcbb1377
merge heads
2011-10-27 18:13:04 -07:00
f6d99ba106
fix comment on 24401e81915f
2011-10-27 17:59:15 -07:00
2bacc8d7b8
add translation_description
2011-10-27 13:21:14 -07:00
dfc5d61514
More translation_descriptions.
2011-10-26 18:04:49 -07:00
b2d989887d
Add translation_description for status messages.
2011-10-26 16:00:49 -07:00
0c72f1e5d3
add translation_descriptions for error messages
2011-10-26 14:19:14 -07:00
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
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
c799f8d716
fix comments for 22e45d5be68c
2011-10-25 16:55:05 -07:00
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
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
f16f7b08c8
merge heads
2011-10-25 11:50:06 -07:00
Jimmy Shih