4ea5b199b9
Merge heads.
2012-04-13 18:07:04 +08:00
2fd3816edf
Fix unit tests
...
- update string in CsvTrackWriter, CsvTrackWriterTest, and DescriptionGeneratorImplTest
- with Solo, UploadResultActivity can run by itself, but cannot run as
part of the unit test. Modify the test to not use Solo.
- remove ANT+ tests in SensorManagerFactoryTest and replace them with
bluetooth tests since most of the phones do not have ANT+.
- remove TrackDetailActivityTest since we are no longer using it to
start the app. Will replace this with end-to-end smoke tests.
2012-04-11 17:02:21 -07:00
4b36671041
merge heads
2012-04-11 10:18:12 -07:00
3a6e6fc980
merge heads
2012-04-11 10:13:01 -07:00
a3e69df3ff
merge heads
2012-04-11 10:11:53 -07:00
0cd11c799d
merge heads
2012-04-11 10:01:41 -07:00
87a0ce47b9
vertically align content in track_list_item.xml
2012-04-10 10:28:39 -07:00
a1993ab39e
merge heads
2012-04-10 10:17:57 -07:00
648015fe4c
merge heads
2012-04-10 10:16:49 -07:00
3d9536420c
merge heads
2012-04-10 10:03:30 -07:00
d5389e8c3e
fix comment on 5ca17d67ad5c
2012-04-10 09:57:58 -07:00
e5d86a708e
Change the code style of DynamicSpeedTrackPathPainterTest and SingleColorTrackPathPainterTest, and make the code easier to read.
2012-04-10 17:54:49 +08:00
eae078b710
Fix bug with setHomeButtonEnabled,
...
it is only defined for api 14 or higher.
2012-04-09 16:46:08 -07:00
119c24f6e6
Add delete and edit menu icons.
2012-04-09 16:43:08 -07:00
7b800914f6
merge heads
2012-04-09 14:07:57 -07:00
97f4103e67
merge heads
2012-04-09 14:07:04 -07:00
99706edf70
Update TrackEditActivity to ICS.
2012-04-09 14:03:42 -07:00
00974d97a7
Place all Google Earth constants in SaveActivity and prefix them with
...
GOOGLE_EARTH.
2012-04-09 10:19:07 -07:00
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
54bfe5d4b4
merge heads
2012-04-07 10:13:16 -07:00
fedcd33b0b
merge heads
2012-04-07 09:56:56 -07:00
cd129e1f46
sync from main
2012-04-07 09:32:13 -07:00
86c736dd17
merge heads
2012-04-06 18:25:57 -07:00
5321878dd2
merge heads
2012-04-06 15:33:09 -07:00
e149683da7
fix merge error
2012-04-06 15:27:18 -07:00
c97ae1e87f
merge heads
2012-04-06 15:16:01 -07:00
0ed45e40c6
Move each fragment to its own class.
2012-04-06 15:09:47 -07:00
70124b8465
merge heads
2012-04-06 12:59:38 -07:00
6c7131f2a8
merge heads
2012-04-06 10:55:58 -07:00
f5085b208d
merge heads
2012-04-06 10:54:22 -07:00
cbd52459bd
Remove screenshot from the translation_description.
...
Will not require retranslation.
2012-04-06 10:50:58 -07:00
28750142a9
Change the code style of SingleColorTrackPathPainterTest and DynamicSpeedTrackPathPainterTest.
2012-04-06 16:27:13 +08:00
9e224d13ad
Fix crashes when trackDataHub is null
2012-04-05 17:50:54 -07:00
5082936ad1
sync from main
2012-04-05 17:06:43 -07:00
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
0314e28766
merge heads
2012-04-05 10:04:05 -07:00
ee92cbf92c
merge heads
2012-04-05 09:58:19 -07:00
d84c4de0d7
fix comment for 3a507cd408b9
2012-04-05 09:55:46 -07:00
8b4c05ead3
fix comment for 7638122cd587
2012-04-05 09:26:23 -07:00
a30e19e365
merge heads
2012-04-05 09:06:59 -07:00
97227ca26e
Merge heads
2012-04-05 14:33:48 +08:00
68f50ef6de
Change the code style of DynamicSpeedTrackPathPainterTest,SingleColorTrackPathPainterTest, SingleColorTrackPathPainter and TrackPathPainterTestCase.
2012-04-05 14:25:30 +08:00
ab8d159791
fix comments for e16572c749ba
2012-04-04 18:12:30 -07:00
883eccb2d0
fix comments for 267c37ed0691
2012-04-04 17:42:25 -07:00
c5fa717d55
merge heads
2012-04-04 16:54:29 -07:00
1c0ce45937
merge heads
2012-04-04 16:49:55 -07:00
aab0f63201
merge heads
2012-04-04 16:44:06 -07:00
d76eb44257
merge heads
2012-04-04 16:40:41 -07:00
336abcce82
merge heads
2012-04-04 14:45:05 -07:00
afa2dd2c0e
merge heads
2012-04-04 14:44:01 -07:00
youtaol