969a677d7d
Add a Share data settings
2011-10-04 18:35:37 -07:00
90470342e7
merge heads
2011-10-04 14:51:45 -07:00
a4e762fb01
update MyTracks permission labels and descriptions
2011-10-04 14:50:00 -07:00
da2d732041
fix proguard issues with google-api-client-1.5.0
2011-10-04 13:57:27 -07:00
6a5acee438
merge heads
2011-09-29 18:14:44 -07:00
49cd5014d2
merge heads
2011-09-28 19:41:18 -07:00
522882c0cc
Added back throwing of IllegalStateExceptions to startNewTrack and
...
endCurrentTrack so they still are thrown when called from the
ServiceBinder methods.
2011-09-28 21:11:45 -05:00
7e8b4dc4b9
Removed ignore_illegal_state string and code the uses it.
...
Removed the throwing of exceptions on start and stop of tracks and instead
added checking to not run them.
2011-09-28 20:22:02 -05:00
8e673f6634
Remove clearTrackDataHub in MyTracksApplication.java
2011-09-28 17:54:11 -07:00
05e6018bd1
Organized code in handleStartCommand into smaller methods to better see the code
...
paths and for eaier maintainability.
2011-09-28 19:22:49 -05:00
e1a845d49f
I think i have done the commit correctly, althought i only had to correct manually keys.xml (add new key from the head branch xml to mine)
2011-09-29 01:34:43 +02:00
2deded2d88
Renamed omit_illegal_state to android.intent.extra.IGNORE_ILLEGAL_STATE
...
Code comment and code style change.
2011-09-27 22:49:53 -05:00
af550a7104
Fixed widget to not cause a unhandled exception to occur if you press on the widget
...
before it can update its button intent.
2011-09-27 19:59:33 -05:00
e68d7eb12d
Upgrade google-api-client from 1.2.2-alpha to 1.5.0-beta.
2011-09-27 14:38:31 -07:00
a186e68ca0
Fix based on Sandor's comments
2011-09-26 11:51:05 -07:00
81c60ca6f2
merge heads
2011-09-26 11:27:34 -07:00
bd9347afd7
merge heads
2011-09-26 10:54:11 -07:00
9023cdf726
merge heads
2011-09-26 10:53:43 -07:00
9caef87899
Automated merge with http://jkasten-mytracks2.googlecode.com/hg
2011-09-23 09:26:21 -07:00
c9d9c065a2
Finally solved instanceof class test. Its ready to merge?
2011-09-23 17:54:58 +02:00
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
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
7bd3128e8f
In MyTracks onDestroy, set trackDataHub to null to save memory
2011-09-22 12:22:23 -07:00
43a1ec60ce
create MyTracksApplication to keep global state like TrackDataHub
2011-09-22 11:25:27 -07:00
d04d83b972
Theorically solved last problem with tests...anything more?
2011-09-22 19:22:28 +02:00
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
4f9b6535fb
Automated merge with http://mytracks.googlecode.com/hg/
2011-09-21 16:17:01 -07:00
6ab1f6158a
Fixes various unit tests
2011-09-21 16:16:37 -07:00
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
7a8ea2666b
Review issues corrected, pending issue about "expect" with class type argument
2011-09-20 22:31:59 +02:00
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
9bb0ba2953
Merge from main repo
2011-09-19 17:38:32 -05:00
0e22eaf7c3
Merging head.
2011-09-19 13:43:58 -07:00
53ee9d31bc
Review issues corrected, added test case for remaining class TrackPathPainterFactory
2011-09-19 20:25:41 +02:00
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
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
8cde2420e7
Merge from main repo
2011-09-13 22:48:50 -05:00
3c4c215931
Review issues corrected
2011-09-13 20:26:28 +02:00
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
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
057c2d69a9
Suggested corrections made (Pending corrections in halt until getting response from the last revision comments i made)
2011-09-10 11:31:22 +02:00
79c2cf90cf
Fix gpx import thread error (issue 559)
2011-09-09 16:51:08 +02:00
20cbdccbf6
Make use of HTTPS urls for google services.
...
Fix formatting by using locale settings
2011-09-09 14:49:31 +02:00
5d05d71210
Track Color Mode Beta
2011-09-06 23:52:51 +02:00
08294e8ada
Avoid RejectedExecutionException.
2011-09-05 21:37:09 -07:00
41f7262280
Merging extra head.
2011-09-02 19:27:46 -07:00
6aa361b801
Merging stride changes
2011-09-02 19:26:06 -07:00
9281e0adf3
Revision comments for rev 5bcaab17e76f addressed.
2011-08-27 14:32:37 +03:00
ace10fc511
Review comments for revision fd70af575b77 addressed.
2011-08-26 18:03:57 +03:00
0ac923e104
already merged
2011-08-25 15:56:16 +03:00
Jimmy Shih