Commit Graph

64 Commits

Author SHA1 Message Date
Jimmy Shih 3a6e6fc980 merge heads 2012-04-11 10:13:01 -07:00
Jimmy Shih a3e69df3ff merge heads 2012-04-11 10:11:53 -07:00
Jimmy Shih 0cd11c799d merge heads 2012-04-11 10:01:41 -07:00
Jimmy Shih a1993ab39e merge heads 2012-04-10 10:17:57 -07:00
Jimmy Shih 648015fe4c merge heads 2012-04-10 10:16:49 -07:00
Jimmy Shih 3d9536420c merge heads 2012-04-10 10:03:30 -07:00
Jimmy Shih d5389e8c3e fix comment on 5ca17d67ad5c 2012-04-10 09:57:58 -07:00
Jimmy Shih 99706edf70 Update TrackEditActivity to ICS. 2012-04-09 14:03:42 -07:00
Jimmy Shih 00974d97a7 Place all Google Earth constants in SaveActivity and prefix them with
GOOGLE_EARTH.
2012-04-09 10:19:07 -07:00
Jimmy Shih adfa66505e Use a dialog for the welcome page. Thus the startup sequence
consists of three dialogs.
Rename to HelpActivity.
Fix activity button styles.
Reuse EulaDialogFragment when invoked from the AboutDialogFragment.
Only hide the title bar on the TrackDetailPage.
2012-04-07 15:52:28 -07:00
Jimmy Shih 54bfe5d4b4 merge heads 2012-04-07 10:13:16 -07:00
Jimmy Shih fedcd33b0b merge heads 2012-04-07 09:56:56 -07:00
Jimmy Shih cd129e1f46 sync from main 2012-04-07 09:32:13 -07:00
Jimmy Shih 86c736dd17 merge heads 2012-04-06 18:25:57 -07:00
Jimmy Shih 5321878dd2 merge heads 2012-04-06 15:33:09 -07:00
Jimmy Shih e149683da7 fix merge error 2012-04-06 15:27:18 -07:00
Jimmy Shih 0ed45e40c6 Move each fragment to its own class. 2012-04-06 15:09:47 -07:00
Jimmy Shih 70124b8465 merge heads 2012-04-06 12:59:38 -07:00
Jimmy Shih 6c7131f2a8 merge heads 2012-04-06 10:55:58 -07:00
Jimmy Shih f5085b208d merge heads 2012-04-06 10:54:22 -07:00
Jimmy Shih cbd52459bd Remove screenshot from the translation_description.
Will not require retranslation.
2012-04-06 10:50:58 -07:00
Jimmy Shih 9e224d13ad Fix crashes when trackDataHub is null 2012-04-05 17:50:54 -07:00
Jimmy Shih 5082936ad1 sync from main 2012-04-05 17:06:43 -07:00
Jimmy Shih 32e8044b0b - add TabManager (based on the Fragment Tabs example in
API 4+ Support Demos)
- move to MapFragment, ChartFragment, and StatsFragment
- use android-support-v4-r7-googlemaps.jar to support a map view
  in a fragment.
2012-04-05 16:55:22 -07:00
Jimmy Shih 0314e28766 merge heads 2012-04-05 10:04:05 -07:00
Jimmy Shih ee92cbf92c merge heads 2012-04-05 09:58:19 -07:00
Jimmy Shih d84c4de0d7 fix comment for 3a507cd408b9 2012-04-05 09:55:46 -07:00
Jimmy Shih 8b4c05ead3 fix comment for 7638122cd587 2012-04-05 09:26:23 -07:00
Jimmy Shih a30e19e365 merge heads 2012-04-05 09:06:59 -07:00
youtaol 97227ca26e Merge heads 2012-04-05 14:33:48 +08:00
Jimmy Shih ab8d159791 fix comments for e16572c749ba 2012-04-04 18:12:30 -07:00
Jimmy Shih 883eccb2d0 fix comments for 267c37ed0691 2012-04-04 17:42:25 -07:00
Jimmy Shih c5fa717d55 merge heads 2012-04-04 16:54:29 -07:00
Jimmy Shih 1c0ce45937 merge heads 2012-04-04 16:49:55 -07:00
Jimmy Shih aab0f63201 merge heads 2012-04-04 16:44:06 -07:00
Jimmy Shih 336abcce82 merge heads 2012-04-04 14:45:05 -07:00
Jimmy Shih afa2dd2c0e merge heads 2012-04-04 14:44:01 -07:00
Jimmy Shih c26e0ecbef merge heads 2012-04-04 14:29:09 -07:00
Jimmy Shih c795c8e482 fix comment for 5c3c3227ff36 2012-04-04 14:26:15 -07:00
Jimmy Shih 12f17e6f49 merge heads 2012-04-03 13:02:35 -07:00
Jimmy Shih 79fde1c118 Rename to fastest pace. 2012-04-03 10:18:16 -07:00
Jimmy Shih a34c17a461 Add a hack to enable building a release candidate.
With proguard "-optimizationpasses 5", not able to
obfuscate the CursorLoader. A known issue.

Remove
- AndoridMockRuntime.jar
- googleloginclient-helper.jar
AndoridMockRuntime.jar was included twice, preventing unit tests
from running.

Clean up classpath to not include jar files in the lib directory.
Else the jar files will get included twice.

Move jar files in MyTracks/lib/google-api-client/ to MyTracks/lib
so that proguard can pick up the jar files.

Clean up proguard.cfg into three sections.
- update the config from the default project
- update the config from the Google APIs client library
- remove unnecessary My Tracks specific "-dontwarn"
2012-04-02 18:45:17 -07:00
Jimmy Shih 840576055f merge heads 2012-04-02 15:17:25 -07:00
Jimmy Shih 9575401127 merge heads 2012-04-02 14:50:06 -07:00
Jimmy Shih 2d05ff98ca merge heads 2012-04-02 14:49:12 -07:00
youtaol 004043c3e5 Change some code style. 2012-03-31 10:18:47 +08:00
Jimmy Shih 4b8d4e92b8 merge heads 2012-03-30 15:23:00 -07:00
Jimmy Shih fa18ace9e6 - remove PlayTrackUtils.
- use sub menu for "Export all...".
- prefix menu variables so they are unique.
- prefix intent extra variables with EXTRA.
2012-03-30 15:13:04 -07:00
Jimmy Shih 6869f003e7 - In the action bar, configure the Home button as the Up button.
- When starting an activity, always use FLAG_ACTIVITY_CLEAR_TOP and FLAG_ACTIVITY_NEW_TASK together.
- TrackDetailActivity should handle events for a specific trackId, not
  handling events for the current recording track.
- In TrackListActivity, to support screen rotation, make sure the EULA dialog
  is not shown before creating another one.
- Do not need to bind service in onStart. OnResume will bind the service
  if a recording is happening.
2012-03-30 14:19:29 -07:00
youtaol 7a4b5569f3 Change code style of SendToGoogleUtilsTest. 2012-03-30 11:18:56 +08:00