Commit Graph

846 Commits

Author SHA1 Message Date
Jimmy Shih bd9347afd7 merge heads 2011-09-26 10:54:11 -07:00
Jimmy Shih 9023cdf726 merge heads 2011-09-26 10:53:43 -07:00
Jimmy Shih 9caef87899 Automated merge with http://jkasten-mytracks2.googlecode.com/hg 2011-09-23 09:26:21 -07:00
Jimmy Shih c024c8d87b Fix proguard issue with fusion table.
Fusion table depends on google-api-client-1.2.2.alpha.jar.
Proguard needs to be set correctly for the google-api-client library.

Tested a release version and is able to send a track to fusion table.
2011-09-22 18:47:31 -07:00
Josh Kasten 850a0d988a Fixed Next key on the virtual keyboard on the "Marker Type" field to the next
field in the waypoint and track details activities.
2011-09-22 20:29:46 -05:00
Josh Kasten 89516c41e3 Added hints to all text input fields with the same value as their label for
all languages.
2011-09-22 00:03:57 -05:00
Josh Kasten bb8e6a51f4 * Added display_settings_screen_key to keys.xml and put it to use in
CheckUnits and SettingsActivity classes for use with intents.

* In SettingsActivity split onCreate() code into initActivityCommons() and
  initActivitySpecifics() methods for easier maintaining of code required
  for all screens and code require for only some screens.
2011-09-20 19:52:53 -05:00
Josh Kasten 3029c6d10c * Changed SettingsActivity and CheckUnits
to use open_settings_screen instead of "Open".

* Cleaned up SettingsActivity by removing the class scoped variable displaySettingsOnly.
2011-09-19 17:54:00 -05:00
Josh Kasten 9bb0ba2953 Merge from main repo 2011-09-19 17:38:32 -05:00
Sandor Dornbush 0e22eaf7c3 Merging head. 2011-09-19 13:43:58 -07:00
Jimmy Shih 7134edf2f2 Create DialogButton and DialogButtonSpacer styles.
Modify mytracks_send_to_google.xml dialog to use these styles.
2011-09-15 11:20:20 -07:00
Jimmy Shih e4da671cbc Improve the buttons layout on the "Send to Google" dialog.
For style,
I sort the attributes alphabetically except for "android:id".
If "android:id" exists, I place it on the same line as the element.
2011-09-14 17:31:57 -07:00
Josh Kasten 8cde2420e7 Merge from main repo 2011-09-13 22:48:50 -05:00
Rodrigo Damazio eb6cdd0fc0 Fixing the fixes for localization and track importing.
Fixes issue 462
Fixes issue 559
Fixes issue 540
2011-09-11 08:16:58 -03:00
Josh Kasten 0b1c24e55c Fixed the first app start message of "Units of Measure Notice" to jump to the
display section of the settings instead of the root when pressing yes.
2011-09-11 02:00:42 -05:00
van.isacker.pieter 79c2cf90cf Fix gpx import thread error (issue 559) 2011-09-09 16:51:08 +02:00
van.isacker.pieter 20cbdccbf6 Make use of HTTPS urls for google services.
Fix formatting by using locale settings
2011-09-09 14:49:31 +02:00
Sandor Dornbush 08294e8ada Avoid RejectedExecutionException. 2011-09-05 21:37:09 -07:00
Sandor Dornbush 41f7262280 Merging extra head. 2011-09-02 19:27:46 -07:00
Sandor Dornbush 6aa361b801 Merging stride changes 2011-09-02 19:26:06 -07:00
Dominik R?ttsches 9281e0adf3 Revision comments for rev 5bcaab17e76f addressed. 2011-08-27 14:32:37 +03:00
Dominik R?ttsches ace10fc511 Review comments for revision fd70af575b77 addressed. 2011-08-26 18:03:57 +03:00
Dominik R?ttsches 0ac923e104 already merged 2011-08-25 15:56:16 +03:00
Dominik R?ttsches 082aa0a34a overriden in ca3651f10063 2011-08-25 15:54:48 +03:00
Dominik R?ttsches acf5c0931f Addressing review comments for StrideReadings class and related test cases:
- removing inner class, and recording of heartbeat timestamps
- fixing issue with rollover by replacing % operator with modulo operation
- comparing problematic firmware id against byte[] instead of String
- removing zephyr packet debug loggin
- not reassigning protobuffers Builders
- moving decision to use workaround into setCadence function
- license and javadoc author for testcase class
- proposal: using introspection to access private fields in testcase in order to determine expected availablity of values from getCadence, alternatively modify access to protected.
- modifying rollover test, hopefully more clear now.
- adding asserts during the loop in this test case.
2011-08-25 15:12:33 +03:00
Dominik R?ttsches ee204f35ef Addressing review comments for revision ca3651f10063.
+ limiting RunCadence to 254, same as it was done for cycling Cadence.
2011-08-25 13:16:02 +03:00
Dominik R?ttsches e885224855 TCX Output Tuning
- Interpret cadence only as biking cadence when activity was marked as biking.
- Otherwise encode as RunCadence in the Extensions
2011-08-21 16:10:01 +03:00
Dominik R?ttsches d48eccc0e4 TCX Output Tuning
- Interpret cadence only as biking cadence when activity was marked as biking.
- Otherwise encode as RunCadence in the Extensions
2011-08-21 16:08:26 +03:00
Dominik R?ttsches 21012b305f Adding battery level to sensor state activity. 2011-08-21 15:00:11 +03:00
Dominik R?ttsches a79e322eff Addressing warning. 2011-08-21 14:17:54 +03:00
Dominik R?ttsches b5a1cf1b10 Adding tests for new StrideReadings class. 2011-08-21 14:11:35 +03:00
Dominik R?ttsches 40ebd7bc2c Adressing a round of review comments. Tests in separate commit. 2011-08-21 13:55:11 +03:00
Dominik R?ttsches ef37ee0f38 Merging batteryLevel branch. 2011-08-21 00:40:47 +03:00
Dominik R?ttsches 49033bf952 Fix for Cadence values from HxM with Hardware/Firmware Identification 0x1A00316550003162 2011-08-20 16:58:36 +03:00
Dominik R?ttsches d9725240a6 Storing battery level in new protobuf field. 2011-08-20 01:25:58 +03:00
Dominik R?ttsches cb5518a261 Adding battery_level to protobuffers spec. 2011-08-20 01:01:43 +03:00
Dominik R?ttsches ac71d8aa2a Fixing TCX generation:
- Cadence before Extensions
- Adding BuildMajor and BuildMinor to Version since it seems to be required by http://connect.garmin.com
- Version Values now only contain integers by splitting mytracks version code at dots, allows correct XML validation.
2011-08-19 23:01:55 +03:00
Sandor Dornbush 62c9af5cba Release v 1.1.8 v1.1.8 2011-08-17 09:34:56 -07:00
Sandor Dornbush a4f16a1f30 Pick up new Chinese translations 2011-08-13 08:25:45 -07:00
Sandor Dornbush 1b595ee7fe Pick up new Chinese translations 2011-08-13 08:24:12 -07:00
Sandor Dornbush fa556e4e33 Merged with head. 2011-08-11 09:28:10 -07:00
Sandor Dornbush 391d718909 Switch widget icons.
Fix errors in finish translation.
2011-08-11 09:06:32 -07:00
Rodrigo Damazio 2ce14e443d Merging to head. 2011-08-08 16:08:38 -03:00
Rodrigo Damazio cdf0a3a3e7 Fixing description/icon in waypoint creation request. 2011-08-07 03:48:59 -03:00
Rodrigo Damazio f00f9a5277 Added APN logging to the signal strength sampler.
(not tested on CDMA)
2011-08-07 03:47:03 -03:00
Ville Muurinen 7112642e89 Merging to head. 2011-08-04 20:50:50 +03:00
Ville Muurinen 3714c21f97 Changed and improved translation based on comments 2011-08-04 20:45:42 +03:00
Rodrigo Damazio 24c49b7f2f Merge with head. 2011-08-01 20:22:31 -03:00
Rodrigo Damazio b16429f3f8 Differentiating between GPS provider unavailable and disabled - unavailable, in some implementations (such as Samsung's) just means it doesn't have a fix.
(Fixes issue 505)
2011-08-01 15:31:42 -03:00
Rodrigo Damazio 27734495f4 Fixing race condition made evident by G1's slowness :) 2011-08-01 14:47:08 -03:00