Merge heads

Browse Source

...

This commit is contained in:

youtaol

2012-05-04 17:04:45 +08:00

parent a12f4bcbe8

commit fd90dcffa6

189 changed files with 3288 additions and 3323 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-mdpi/appwidget_background.9.png → MyTracks/res/drawable-mdpi/app_widget_background.9.png

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

MyTracks/res/drawable-mdpi/appwidget_button_disabled.png → MyTracks/res/drawable-mdpi/app_widget_button_disabled.png

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

MyTracks/res/drawable-mdpi/appwidget_button_enabled.png → MyTracks/res/drawable-mdpi/app_widget_button_enabled.png

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

MyTracks/res/drawable-mdpi/googledocs_icon.png → MyTracks/res/drawable-mdpi/google_docs_icon.png

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

MyTracks/res/drawable-mdpi/google_fusion_tables_icon.png

BIN

Binary file not shown.

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

MyTracks/res/drawable-mdpi/maps_icon.png → MyTracks/res/drawable-mdpi/google_maps_icon.png

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

MyTracks/res/drawable-mdpi/ic_menu_chartsettings.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.8 KiB

MyTracks/res/drawable-mdpi/ic_menu_sensorstatus.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.8 KiB

MyTracks/res/drawable-mdpi/ic_menu_statistics.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.2 KiB

MyTracks/res/drawable-mdpi/ic_menu_waypoints.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.0 KiB

MyTracks/res/drawable-mdpi/menu_aggregated_statistics.png

BIN

Binary file not shown.

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

MyTracks/res/drawable-mdpi/menu_chart_settings.png

BIN

Binary file not shown.

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

MyTracks/res/drawable-mdpi/menu_delete_all.png

BIN

Binary file not shown.

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

MyTracks/res/drawable-mdpi/menu_elevation.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 913 B

MyTracks/res/drawable-mdpi/menu_import.png

BIN

Binary file not shown.

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

MyTracks/res/drawable-mdpi/menu_markers.png

BIN

Binary file not shown.

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

MyTracks/res/drawable-mdpi/menu_satellite_mode.png

BIN

Binary file not shown.

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

MyTracks/res/drawable-mdpi/menu_save.png

BIN

Binary file not shown.

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

MyTracks/res/drawable-mdpi/menu_save_all.png

BIN

Binary file not shown.

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

MyTracks/res/drawable-mdpi/menu_send_google.png

BIN

Binary file not shown.

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

MyTracks/res/drawable-mdpi/menu_sensor_state.png

BIN

Binary file not shown.

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

MyTracks/res/drawable-mdpi/menu_stats_settings.png

BIN

Binary file not shown.

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

MyTracks/res/drawable-mdpi/my_location_normal.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 945 B

MyTracks/res/drawable-mdpi/my_location_pressed.png

BIN

Binary file not shown.

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

MyTracks/res/drawable-mdpi/my_tracks_notification_icon.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 812 B

MyTracks/res/drawable-mdpi/tab_chart.png

BIN

Binary file not shown.

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

MyTracks/res/drawable-mdpi/tab_map.png

BIN

Binary file not shown.

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

MyTracks/res/drawable-mdpi/tab_stats.png

BIN

Binary file not shown.

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

MyTracks/res/drawable-mdpi/ylw_pushpin.png → MyTracks/res/drawable-mdpi/yellow_pushpin.png

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