youtaol
e5078627c1
Merge heads
2012-09-03 14:17:09 +08:00
youtaol
3b92eb3a23
Change code style.
2012-09-03 14:15:22 +08:00
Jimmy Shih
9e85c0b8d5
Change the track_detail menu item order.
...
Place voice frequency and split markers just above settings.
2012-08-31 15:44:23 -07:00
Jimmy Shih
af4a24053b
merge conflicts, update ids
2012-08-31 15:08:39 -07:00
Jimmy Shih
544eb798b0
merge heads
2012-08-31 14:52:58 -07:00
Jimmy Shih
b7c2f85a02
Add TrackController UI in TrackDetailActivity.
2012-08-31 14:51:05 -07:00
youtaol
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
youtaol
90e621db1f
Merge heads
2012-08-31 09:57:35 +08:00
youtaol
da6f3da448
Change the code style to send Gps signal to emulator.
2012-08-31 09:54:45 +08:00
Jimmy Shih
8a7786f9ca
In TrackWriterImpl, write an empty track if the track has no valid locations.
2012-08-30 16:12:31 -07:00
Jimmy Shih
af32c4f40f
Improve resume/pause layout
2012-08-30 14:57:01 -07:00
Jimmy Shih
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
Jimmy Shih
3b83d12056
merge heads
2012-08-30 12:32:01 -07:00
Jimmy Shih
5d34ddbd13
Change target sdk version to 16.
2012-08-30 12:31:16 -07:00
Jimmy Shih
9c0e522804
merge heads
2012-08-30 11:25:09 -07:00
Jimmy Shih
59f2092482
Check in the new record/pause UI in TrackListActivity.
2012-08-30 11:21:56 -07:00
youtaol
ac119d815c
Merge heads
2012-08-29 17:16:16 +08:00
youtaol
2212abe3c7
Add a check about the points of Paused track.
2012-08-29 17:15:55 +08:00
Jimmy Shih
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
Jimmy Shih
2f6e36a8bc
Update GpxImporter to support tracks with pauses.
2012-08-28 17:44:40 -07:00
youtaol
df06149c6d
Add test case about sending a paused track to Google.
2012-08-28 15:37:57 +08:00
youtaol
14ea38da8b
Merge heads
2012-08-28 10:41:34 +08:00
youtaol
6a9fa7c488
Add pause, resume, export and import test cases for Pause feature.
2012-08-28 10:36:04 +08:00
Jimmy Shih
34889bc460
Update SendToGoogleUtil to take into account of pause/resume separator.
2012-08-27 15:27:56 -07:00
Jimmy Shih
f89433322b
merge heads
2012-08-27 12:18:08 -07:00
Jimmy Shih
25778911c9
For periodic task, set the next time based on current total time
...
rather than track start time. The current total time would
take into account pause/resume time.
2012-08-27 12:17:23 -07:00
youtaol
631bfe8302
Fix an error of test.
2012-08-27 20:21:27 +08:00
youtaol
9565e81dab
Merge heads
2012-08-27 10:31:25 +08:00
Jimmy Shih
296cd81167
In TrackRecordingService, fix the code on detecting if a location
...
is already inserted in the database.
In TripStatisticsUpdater, improve total distance accuracy by
taking into account the last point in a segment.
2012-08-24 17:46:16 -07:00
Jimmy Shih
41278eb137
Rename TripStatisticsBuilder to TripStatisticsUpdater.
...
No logic change.
2012-08-24 15:57:27 -07:00
Jimmy Shih
be6fd6d633
Rename methods in MyTracksProviderUtils.
...
No logic change
2012-08-24 15:21:39 -07:00
Jimmy Shih
784ce8bc26
Remove unused methods in MyTracksProviderUtils
...
Change getLastValidLocation to getLastValidTrackLocation, thus
all location related api takes trackId as an argument.
2012-08-24 14:05:50 -07:00
Jimmy Shih
c6861d1e49
In ChartFragment, MapFragment, StatsFragment, for callbacks from
...
TrackDataHub, check that the fragment is resumed.
In any runnable executed on the UI thread, also check
that the fragment is resumed.
2012-08-24 12:46:11 -07:00
Jimmy Shih
2c87df6d75
merge heads
2012-08-24 09:46:37 -07:00
youtaol
3ef2a9c901
Fix an error when test in Chinese.
2012-08-24 14:51:24 +08:00
youtaol
9859e4ff14
Merge heads
2012-08-24 12:42:57 +08:00
youtaol
bc37316fa5
Add pause test case in CreateAndSendTrackTest.
2012-08-24 12:42:22 +08:00
Jimmy Shih
0ddd11aef5
Fix Stats view.
...
- when paused, do not update current location
- handle possible null pointer for getActivity
In MyTraksProviderUtils, change to
getLastValidLocation
2012-08-23 18:24:08 -07:00
Jimmy Shih
b164398d47
merge heads
2012-08-23 14:59:58 -07:00
Jimmy Shih
9f63125816
- In MapView, only show the no gps message when recording.
...
- Different messages for no gps signal and need better gps signal.
- Add debug line when location is not inserted due to accuracy issue
and min recording distance requirement.
2012-08-23 14:58:36 -07:00
Jimmy Shih
02f0f4831e
Use TripStatisticsBuilder in
...
- SendMapsAsyncTask
- SendFusionTablesAsyncTask
- ChartFragment
In ChartURLGenerator
- change the input vector unit to be in meters
2012-08-23 14:12:08 -07:00
youtaol
dcf5e5668a
Merge heads
2012-08-23 19:28:32 +08:00
youtaol
f008975936
Use default(first) account in choose account dialog.
2012-08-23 19:27:51 +08:00
Jimmy Shih
2bfb1ff49e
merge heads
2012-08-22 16:20:40 -07:00
Jimmy Shih
b0bb09db08
Add support to show both moving time and total time.
2012-08-22 15:52:14 -07:00
Jimmy Shih
b3ad974bbb
Update the ui thread in StatsFragment to support pause/resume
...
for the total time.
2012-08-22 13:16:18 -07:00
youtaol
40dba3d183
Add a check when more than one account is bound with phone.
2012-08-22 15:29:03 +08:00
Jimmy Shih
ccaf652c8b
Add support for pause and resume in TrackRecordingService.
2012-08-21 18:36:04 -07:00
Jimmy Shih
832e2499c9
merge heads
2012-08-20 11:00:16 -07:00
Jimmy Shih
12ce7e3b0d
merge heads
2012-08-20 10:59:22 -07:00