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
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
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
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
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
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
youtaol
7a4b5569f3
Change code style of SendToGoogleUtilsTest.
2012-03-30 11:18:56 +08:00
youtaol
eae2b63586
change some code style of SendToGoogleUtilsTest.
2012-03-29 15:14:37 +08:00
youtaol
0f2d77400e
Test case for SendToGoogleUtils.java.
2012-03-23 12:34:52 +08:00
Jimmy Shih
0bd4461c32
merge heads
2012-03-22 12:12:14 -07:00
Jimmy Shih
3044a1daea
merge heads
2012-03-22 12:11:21 -07:00
Jimmy Shih
bd9a88b903
Change "min pace" wording to "max pace".
...
See
http://code.google.com/p/mytracks/issues/detail?id=841
2012-03-12 16:35:11 -07:00