af4a24053b
merge conflicts, update ids
2012-08-31 15:08:39 -07:00
544eb798b0
merge heads
2012-08-31 14:52:58 -07:00
b7c2f85a02
Add TrackController UI in TrackDetailActivity.
2012-08-31 14:51:05 -07:00
c8bcfe654b
Add method pauseRecording() and resumeRecording() in EndToEndTestUtils. Make some changes to make start, pause, resume, stop track recording can runs well on the new UI(Move these buttons down from action bar in TrackListActivity).
2012-08-31 17:08:41 +08:00
90e621db1f
Merge heads
2012-08-31 09:57:35 +08:00
da6f3da448
Change the code style to send Gps signal to emulator.
2012-08-31 09:54:45 +08:00
8a7786f9ca
In TrackWriterImpl, write an empty track if the track has no valid locations.
2012-08-30 16:12:31 -07:00
378cae7151
In MarkerList, do not show insert waypoint if paused.
...
In SearchList, update icon based on recording or paused state.
In TrackDetail, do not show insert waypoint if paused.
In TrackDetail, always show voice frequency and split marker settings.
2012-08-30 13:21:46 -07:00
3b83d12056
merge heads
2012-08-30 12:32:01 -07:00
5d34ddbd13
Change target sdk version to 16.
2012-08-30 12:31:16 -07:00
ac119d815c
Merge heads
2012-08-29 17:16:16 +08:00
2212abe3c7
Add a check about the points of Paused track.
2012-08-29 17:15:55 +08:00
09453d13cd
If a GPX file doesn't contain timestamp, use the import
...
time as the track starting time.
2012-08-28 18:24:33 -07:00
2f6e36a8bc
Update GpxImporter to support tracks with pauses.
2012-08-28 17:44:40 -07:00
df06149c6d
Add test case about sending a paused track to Google.
2012-08-28 15:37:57 +08:00
14ea38da8b
Merge heads
2012-08-28 10:41:34 +08:00
6a9fa7c488
Add pause, resume, export and import test cases for Pause feature.
2012-08-28 10:36:04 +08:00
34889bc460
Update SendToGoogleUtil to take into account of pause/resume separator.
2012-08-27 15:27:56 -07:00
631bfe8302
Fix an error of test.
2012-08-27 20:21:27 +08:00
9565e81dab
Merge heads
2012-08-27 10:31:25 +08:00
3ef2a9c901
Fix an error when test in Chinese.
2012-08-24 14:51:24 +08:00
9859e4ff14
Merge heads
2012-08-24 12:42:57 +08:00
bc37316fa5
Add pause test case in CreateAndSendTrackTest.
2012-08-24 12:42:22 +08:00
Jimmy Shih