Merge

2015-03-20 11:47:05 +02:00 · 2015-03-20 11:47:05 +02:00 · 9a0b8aff61
commit 9a0b8aff61
parent 306f3dfeaf 26ae3622e5
673 changed files with 842 additions and 2637 deletions
--- a/OsmAnd/copy_widget_icons.sh
+++ b/OsmAnd/copy_widget_icons.sh
@ -0,0 +1,6 @@
 cp -f res/drawable-hdpi/widget_* res/drawable-large/
 cp -f res/drawable-xxhdpi/widget_* res/drawable-large-hdpi/
 cp -f res/drawable-xhdpi/widget_* res/drawable-large-xhdpi/
 cp -f res/drawable-hdpi/map_* res/drawable-large/
 cp -f res/drawable-xhdpi/map_* res/drawable-large-hdpi/
 cp -f res/drawable-xxhdpi/map_* res/drawable-large-xhdpi/
--- a/OsmAnd/res/drawable-hdpi/arrow_down.png
+++ b/OsmAnd/res/drawable-hdpi/arrow_down.png
--- a/OsmAnd/res/drawable-hdpi/arrow_up.png
+++ b/OsmAnd/res/drawable-hdpi/arrow_up.png
--- a/OsmAnd/res/drawable-hdpi/background.png
+++ b/OsmAnd/res/drawable-hdpi/background.png
--- a/OsmAnd/res/drawable-hdpi/bg_left_pushed.9.png
+++ b/OsmAnd/res/drawable-hdpi/bg_left_pushed.9.png
--- a/OsmAnd/res/drawable-hdpi/bg_left_simple.9.png
+++ b/OsmAnd/res/drawable-hdpi/bg_left_simple.9.png
--- a/OsmAnd/res/drawable-hdpi/bg_leftr_pushed.9.png
+++ b/OsmAnd/res/drawable-hdpi/bg_leftr_pushed.9.png
--- a/OsmAnd/res/drawable-hdpi/bg_leftr_simple.9.png
+++ b/OsmAnd/res/drawable-hdpi/bg_leftr_simple.9.png
--- a/OsmAnd/res/drawable-hdpi/bg_right_pushed.9.png
+++ b/OsmAnd/res/drawable-hdpi/bg_right_pushed.9.png
--- a/OsmAnd/res/drawable-hdpi/bg_right_simple.9.png
+++ b/OsmAnd/res/drawable-hdpi/bg_right_simple.9.png
--- a/OsmAnd/res/drawable-hdpi/bg_rightr_pushed.9.png
+++ b/OsmAnd/res/drawable-hdpi/bg_rightr_pushed.9.png
--- a/OsmAnd/res/drawable-hdpi/bg_rightr_simple.9.png
+++ b/OsmAnd/res/drawable-hdpi/bg_rightr_simple.9.png
--- a/OsmAnd/res/drawable-hdpi/bg_striped_img.png
+++ b/OsmAnd/res/drawable-hdpi/bg_striped_img.png
--- a/OsmAnd/res/drawable-hdpi/bg_striped_split_img.png
+++ b/OsmAnd/res/drawable-hdpi/bg_striped_split_img.png
--- a/OsmAnd/res/drawable-hdpi/button_icon_favorites.png
+++ b/OsmAnd/res/drawable-hdpi/button_icon_favorites.png
--- a/OsmAnd/res/drawable-hdpi/button_icon_map.png
+++ b/OsmAnd/res/drawable-hdpi/button_icon_map.png
--- a/OsmAnd/res/drawable-hdpi/button_icon_search.png
+++ b/OsmAnd/res/drawable-hdpi/button_icon_search.png
--- a/OsmAnd/res/drawable-hdpi/button_icon_settings.png
+++ b/OsmAnd/res/drawable-hdpi/button_icon_settings.png
--- a/OsmAnd/res/drawable-hdpi/expandable_category_empty.png
+++ b/OsmAnd/res/drawable-hdpi/expandable_category_empty.png
--- a/OsmAnd/res/drawable-hdpi/expandable_category_pushed.png
+++ b/OsmAnd/res/drawable-hdpi/expandable_category_pushed.png
--- a/OsmAnd/res/drawable-hdpi/expandable_category_unpushed.png
+++ b/OsmAnd/res/drawable-hdpi/expandable_category_unpushed.png
--- a/OsmAnd/res/drawable-hdpi/headline_close_button__original.png
+++ b/OsmAnd/res/drawable-hdpi/headline_close_button__original.png
--- a/OsmAnd/res/drawable-hdpi/headline_close_button_pressed__original.png
+++ b/OsmAnd/res/drawable-hdpi/headline_close_button_pressed__original.png
--- a/OsmAnd/res/drawable-hdpi/help_icon_pressed.png
+++ b/OsmAnd/res/drawable-hdpi/help_icon_pressed.png
--- a/OsmAnd/res/drawable-hdpi/help_icon_pressed__original.png
+++ b/OsmAnd/res/drawable-hdpi/help_icon_pressed__original.png
--- a/OsmAnd/res/drawable-hdpi/help_icon_simple.png
+++ b/OsmAnd/res/drawable-hdpi/help_icon_simple.png
--- a/OsmAnd/res/drawable-hdpi/help_icon_simple__original.png
+++ b/OsmAnd/res/drawable-hdpi/help_icon_simple__original.png
--- a/OsmAnd/res/drawable-hdpi/ic_ac_close.png
+++ b/OsmAnd/res/drawable-hdpi/ic_ac_close.png
--- a/OsmAnd/res/drawable-hdpi/ic_ac_help.png
+++ b/OsmAnd/res/drawable-hdpi/ic_ac_help.png
--- a/OsmAnd/res/drawable-hdpi/ic_ac_settings.png
+++ b/OsmAnd/res/drawable-hdpi/ic_ac_settings.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_altitude.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_altitude.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_car_light.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_car_light.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_close_light.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_close_light.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_flag_light.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_flag_light.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_flage_light.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_flage_light.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_foot_light.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_foot_light.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_gabout_light.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_gabout_light.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_gcall_light.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_gcall_light.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_gdirections_light.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_gdirections_light.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_gdiscard_dark.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_gdiscard_dark.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_gdiscard_light.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_gdiscard_light.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_gfav_dark.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_gfav_dark.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_gfav_light.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_gfav_light.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_ghelp_dark.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_ghelp_dark.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_ghelp_light.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_ghelp_light.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_glabel_dark.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_glabel_dark.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_glabel_light.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_glabel_light.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_gps_info.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_gps_info.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_gremove_light.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_gremove_light.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_grot_left_light.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_grot_left_light.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_grot_right_light.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_grot_right_light.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_gsave_light.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_gsave_light.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_gsearch_light.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_gsearch_light.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_gsettings_light.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_gsettings_light.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_gshare_light.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_gshare_light.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_gup_light.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_gup_light.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_intermediate.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_intermediate.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_max_speed.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_max_speed.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_next_turn.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_next_turn.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_photo_light.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_photo_light.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_pin_light.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_pin_light.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_play_light.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_play_light.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_plus_light.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_plus_light.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_polygom_light.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_polygom_light.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_quit_light.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_quit_light.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_redo_light.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_redo_light.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_refresh_light.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_refresh_light.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_road_light.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_road_light.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_road_works_light.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_road_works_light.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_ruler_light.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_ruler_light.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_sail_boat_light.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_sail_boat_light.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_search_light.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_search_light.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_settings2_light.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_settings2_light.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_signpost_light.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_signpost_light.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_speed.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_speed.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_street_view_light.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_street_view_light.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_target.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_target.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_text_light.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_text_light.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_time.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_time.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_time_to_distance.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_time_to_distance.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_trekking_light.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_trekking_light.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_truck_light.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_truck_light.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_undo_light.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_undo_light.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_up_light.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_up_light.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_video_light.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_video_light.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_wmap_dark.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_wmap_dark.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_wmap_light.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_wmap_light.png
--- a/OsmAnd/res/drawable-hdpi/ic_background_tabinfotext.9.png
+++ b/OsmAnd/res/drawable-hdpi/ic_background_tabinfotext.9.png
--- a/OsmAnd/res/drawable-hdpi/ic_configure_screen_light.png
+++ b/OsmAnd/res/drawable-hdpi/ic_configure_screen_light.png
--- a/OsmAnd/res/drawable-hdpi/ic_dashboard_light.png
+++ b/OsmAnd/res/drawable-hdpi/ic_dashboard_light.png
--- a/OsmAnd/res/drawable-hdpi/ic_extension_light.png
+++ b/OsmAnd/res/drawable-hdpi/ic_extension_light.png
--- a/OsmAnd/res/drawable-hdpi/ic_layer_bottom_light.png
+++ b/OsmAnd/res/drawable-hdpi/ic_layer_bottom_light.png
--- a/OsmAnd/res/drawable-hdpi/ic_layer_top_light.png
+++ b/OsmAnd/res/drawable-hdpi/ic_layer_top_light.png
--- a/OsmAnd/res/drawable-hdpi/ic_osmo_light.png
+++ b/OsmAnd/res/drawable-hdpi/ic_osmo_light.png
--- a/OsmAnd/res/drawable-hdpi/ic_play_light.png
+++ b/OsmAnd/res/drawable-hdpi/ic_play_light.png
--- a/OsmAnd/res/drawable-hdpi/ic_world_globe_light.png
+++ b/OsmAnd/res/drawable-hdpi/ic_world_globe_light.png
--- a/OsmAnd/res/drawable-hdpi/la_backtoloc_disabled.png
+++ b/OsmAnd/res/drawable-hdpi/la_backtoloc_disabled.png
--- a/OsmAnd/res/drawable-hdpi/la_backtoloc_enabled.png
+++ b/OsmAnd/res/drawable-hdpi/la_backtoloc_enabled.png
--- a/OsmAnd/res/drawable-hdpi/la_backtoloc_enabled_white.png
+++ b/OsmAnd/res/drawable-hdpi/la_backtoloc_enabled_white.png
--- a/OsmAnd/res/drawable-hdpi/la_backtoloc_tracked.png
+++ b/OsmAnd/res/drawable-hdpi/la_backtoloc_tracked.png
--- a/Show more
+++ b/Show more