Merge heads

Browse Source

...

This commit is contained in:

youtaol

2013-07-03 11:19:22 +08:00

parent 7bee6470bd

commit b4e94b9af1

53 changed files with 135 additions and 60 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

MyTracks/res/drawable-xhdpi/arrow_180.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.0 KiB

MyTracks/res/drawable-xhdpi/arrow_320.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.2 KiB

MyTracks/res/drawable-xhdpi/blue_pushpin.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 52 KiB

MyTracks/res/drawable-xhdpi/btn_pause.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 7.7 KiB After Width:  |  Height:  |  Size: 7.4 KiB

MyTracks/res/drawable-xhdpi/btn_pause_pressed.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 13 KiB

MyTracks/res/drawable-xhdpi/btn_record.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 9.4 KiB After Width:  |  Height:  |  Size: 10 KiB

MyTracks/res/drawable-xhdpi/btn_record_pressed.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 13 KiB

MyTracks/res/drawable-xhdpi/btn_stop_0.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 8.2 KiB After Width:  |  Height:  |  Size: 8.5 KiB

MyTracks/res/drawable-xhdpi/btn_stop_1.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 8.7 KiB After Width:  |  Height:  |  Size: 9.3 KiB

MyTracks/res/drawable-xhdpi/btn_stop_1_pressed.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 14 KiB

MyTracks/res/drawable-xhdpi/menu_map_layer.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.7 KiB After Width:  |  Height:  |  Size: 3.3 KiB

MyTracks/res/drawable-xhdpi/menu_markers.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.4 KiB After Width:  |  Height:  |  Size: 3.3 KiB

MyTracks/res/drawable-xhdpi/track_paused.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.9 KiB

MyTracks/res/drawable-xhdpi/track_recording.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.3 KiB

MyTracks/res/drawable-xhdpi/warning.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.3 KiB

MyTracks/res/drawable-xhdpi/yellow_pushpin.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 62 KiB