Merge heads

Browse Source

...

This commit is contained in:

youtaol

2013-07-10 14:19:41 +08:00

parent fd3940fcd0

commit 4debca0054

220 changed files with 359 additions and 293 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 → MyTracks/res/drawable-xhdpi/ic_arrow_180.png

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

MyTracks/res/drawable-xhdpi/arrow_320.png → MyTracks/res/drawable-xhdpi/ic_arrow_320.png

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

MyTracks/res/drawable-xhdpi/btn_pause.png → MyTracks/res/drawable-xhdpi/ic_button_pause.png

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

MyTracks/res/drawable-xhdpi/btn_pause_pressed.png → MyTracks/res/drawable-xhdpi/ic_button_pause_pressed.png

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

MyTracks/res/drawable-xhdpi/btn_record.png → MyTracks/res/drawable-xhdpi/ic_button_record.png

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

MyTracks/res/drawable-xhdpi/btn_record_pressed.png → MyTracks/res/drawable-xhdpi/ic_button_record_pressed.png

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

MyTracks/res/drawable-xhdpi/btn_stop_1.png → MyTracks/res/drawable-xhdpi/ic_button_stop.png

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

MyTracks/res/drawable-xhdpi/btn_stop_0.png → MyTracks/res/drawable-xhdpi/ic_button_stop_disabled.png

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

MyTracks/res/drawable-xhdpi/btn_stop_1_pressed.png → MyTracks/res/drawable-xhdpi/ic_button_stop_pressed.png

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

MyTracks/res/drawable-xhdpi/ic_dialog_success.png

BIN

Binary file not shown.

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

MyTracks/res/drawable-xhdpi/blue_pushpin.png → MyTracks/res/drawable-xhdpi/ic_marker_blue_pushpin.png

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

MyTracks/res/drawable-xhdpi/green_dot.png → MyTracks/res/drawable-xhdpi/ic_marker_green_paddle.png

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

MyTracks/res/drawable-xhdpi/red_dot.png → MyTracks/res/drawable-xhdpi/ic_marker_red_paddle.png

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

MyTracks/res/drawable-xhdpi/yellow_pushpin.png → MyTracks/res/drawable-xhdpi/ic_marker_yellow_pushpin.png

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

MyTracks/res/drawable-xhdpi/menu_aggregated_statistics.png → MyTracks/res/drawable-xhdpi/ic_menu_aggregated_statistics.png

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

MyTracks/res/drawable-xhdpi/menu_delete.png → MyTracks/res/drawable-xhdpi/ic_menu_delete.png

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

MyTracks/res/drawable-xhdpi/menu_edit.png → MyTracks/res/drawable-xhdpi/ic_menu_edit.png

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

MyTracks/res/drawable-xhdpi/menu_export.png → MyTracks/res/drawable-xhdpi/ic_menu_export.png

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

MyTracks/res/drawable-xhdpi/menu_feedback.png → MyTracks/res/drawable-xhdpi/ic_menu_feedback.png

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

MyTracks/res/drawable-xhdpi/menu_help.png → MyTracks/res/drawable-xhdpi/ic_menu_help.png

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

MyTracks/res/drawable-xhdpi/menu_import.png → MyTracks/res/drawable-xhdpi/ic_menu_import.png

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

MyTracks/res/drawable-xhdpi/menu_insert_marker.png → MyTracks/res/drawable-xhdpi/ic_menu_insert_marker.png

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

MyTracks/res/drawable-xhdpi/menu_map_layer.png → MyTracks/res/drawable-xhdpi/ic_menu_map_layer.png

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

MyTracks/res/drawable-xhdpi/menu_markers.png → MyTracks/res/drawable-xhdpi/ic_menu_markers.png

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

MyTracks/res/drawable-xhdpi/menu_play.png → MyTracks/res/drawable-xhdpi/ic_menu_play.png

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

MyTracks/res/drawable-xhdpi/menu_refresh.png → MyTracks/res/drawable-xhdpi/ic_menu_refresh.png

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

MyTracks/res/drawable-xhdpi/menu_search.png → MyTracks/res/drawable-xhdpi/ic_menu_search.png

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

MyTracks/res/drawable-xhdpi/menu_select_all.png → MyTracks/res/drawable-xhdpi/ic_menu_select_all.png

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

MyTracks/res/drawable-xhdpi/menu_sensor_state.png → MyTracks/res/drawable-xhdpi/ic_menu_sensor_state.png

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

MyTracks/res/drawable-xhdpi/menu_settings.png → MyTracks/res/drawable-xhdpi/ic_menu_settings.png

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

MyTracks/res/drawable-xhdpi/menu_share.png → MyTracks/res/drawable-xhdpi/ic_menu_share.png

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

MyTracks/res/drawable-xhdpi/menu_show_on_map.png → MyTracks/res/drawable-xhdpi/ic_menu_show_on_map.png

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

MyTracks/res/drawable-xhdpi/menu_split_frequency.png → MyTracks/res/drawable-xhdpi/ic_menu_split_frequency.png

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

MyTracks/res/drawable-xhdpi/menu_start_gps.png → MyTracks/res/drawable-xhdpi/ic_menu_start_gps.png

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

MyTracks/res/drawable-xhdpi/menu_stop_gps.png → MyTracks/res/drawable-xhdpi/ic_menu_stop_gps.png

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

MyTracks/res/drawable-xhdpi/menu_voice_frequency.png → MyTracks/res/drawable-xhdpi/ic_menu_voice_frequency.png

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

MyTracks/res/drawable-xhdpi/my_location_normal.png → MyTracks/res/drawable-xhdpi/ic_my_location.png

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

MyTracks/res/drawable-xhdpi/my_location_pressed.png → MyTracks/res/drawable-xhdpi/ic_my_location_pressed.png

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

MyTracks/res/drawable-xhdpi/track_airplane.png → MyTracks/res/drawable-xhdpi/ic_track_airplane.png

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

MyTracks/res/drawable-xhdpi/track_bike.png → MyTracks/res/drawable-xhdpi/ic_track_bike.png

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

MyTracks/res/drawable-xhdpi/track_boat.png → MyTracks/res/drawable-xhdpi/ic_track_boat.png

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

MyTracks/res/drawable-xhdpi/track_drive.png → MyTracks/res/drawable-xhdpi/ic_track_drive.png

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

MyTracks/res/drawable-xhdpi/track_paused.png → MyTracks/res/drawable-xhdpi/ic_track_paused.png

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

MyTracks/res/drawable-xhdpi/track_recording.png → MyTracks/res/drawable-xhdpi/ic_track_recording.png

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

MyTracks/res/drawable-xhdpi/track_run.png → MyTracks/res/drawable-xhdpi/ic_track_run.png

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

MyTracks/res/drawable-xhdpi/track_ski.png → MyTracks/res/drawable-xhdpi/ic_track_ski.png

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

MyTracks/res/drawable-xhdpi/track_snow_boarding.png → MyTracks/res/drawable-xhdpi/ic_track_snow_boarding.png

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

MyTracks/res/drawable-xhdpi/track_walk.png → MyTracks/res/drawable-xhdpi/ic_track_walk.png

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

MyTracks/res/drawable-xhdpi/warning.png → MyTracks/res/drawable-xhdpi/ic_warning.png

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