5a32550f85
merge heads
2012-04-24 09:55:17 -07:00
920f8e4180
Change the way to generate the SQL statement to fix http://code.google.com/p/mytracks/issues/detail?id=907 .
2012-04-24 19:25:45 +08:00
352137c440
fix comment for 3e985a497047
2012-04-19 10:40:10 -07:00
172aed44ab
fix merge conflict
2012-04-17 12:30:56 -07:00
09a6a0a604
sync from main
2012-04-17 12:27:12 -07:00
89b16e48e9
Add MarkerEditActivity, MarkerListActivity, MarkerDetailActivity.
2012-04-17 12:25:54 -07:00
45855c794c
merge heads
2012-04-17 10:10:50 -07:00
d402c5555c
fix comment for 3fe71196df15
2012-04-17 09:45:59 -07:00
fef4d6bc23
merge heads
2012-04-17 09:39:20 -07:00
dc7fb591be
merge heads
2012-04-16 10:18:33 -07:00
f66742ec98
merge heads
2012-04-16 10:12:22 -07:00
da6c33617c
merge heads
2012-04-16 10:03:42 -07:00
4ea5b199b9
Merge heads.
2012-04-13 18:07:04 +08:00
00eee811f4
Add an empty view when the track list is empty.
2012-04-12 16:48:59 -07:00
e3f13dd633
In contextual action mode, add the track name as the action mode title.
2012-04-12 15:43:50 -07:00
178b1be990
Rename ServiceUtils.java to TrackRecordingSeriviceConnectionUtils.
...
Move common code between TrackListActivity and TrackDetailActivity
for dealing with TrackRecordingServiceConnection in the utility class.
2012-04-12 15:17:46 -07:00
2aa4cdc442
Add PreferencesUtils to access
...
- recording track id
- selected track id
2012-04-12 14:26:18 -07:00
53c5ebbef9
merge heads
2012-04-12 13:25:33 -07:00
c98b10c548
merge heads
2012-04-12 13:25:12 -07:00
08e460d208
Fix unit tests to run in any timezone.
2012-04-12 13:14:35 -07:00
06322dcfdc
fix comment 5e46fdb4a91d
2012-04-12 12:55:39 -07:00
d045b0440f
fix unit tests in TrackRecordingServiceTest
2012-04-12 12:50:03 -07: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
28f3565bae
sync from main
2012-04-11 10:29:52 -07:00
e82c3f15d2
should have been part of 5e46fdb4a91d
2012-04-11 10:25:07 -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
9063267db1
Add contextual menu.
...
API < 11, use floating context menu.
API >=11, use contextual action mode.
2012-04-10 19:59:36 -07:00
df23d20d32
should have been part of 90f307ee08cd
2012-04-10 12:57:31 -07:00
3b889753db
In TrackList, start the TrackDetail view when recording.
2012-04-10 12:53:59 -07:00
400051d342
Move dialogs in TrackDetail to fragments.
...
Move all fragments to com.google.android.apps.mytracks.fragments
package.
2012-04-10 12:44:40 -07:00
2fbdb9bfef
merge heads
2012-04-10 10:31:02 -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
Jimmy Shih