diff --git a/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java b/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java index e0ef202ebc..496e35290e 100644 --- a/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java +++ b/OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java @@ -73,7 +73,9 @@ public class OsmandMonitoringPlugin extends OsmandPlugin { @Override public void updateLayers(OsmandMapTileView mapView, MapActivity activity) { - monitoringControl.updateInfo(); + if(monitoringControl != null) { + monitoringControl.updateInfo(); + } } @Override diff --git a/config/logo/free/headline_osmand_icon.png b/config/logo/free/headline_osmand_icon.png new file mode 100644 index 0000000000..bf609e1ffb Binary files /dev/null and b/config/logo/free/headline_osmand_icon.png differ diff --git a/config/logo/free/icon_32.png b/config/logo/free/icon_32.png new file mode 100644 index 0000000000..f07a26dcf7 Binary files /dev/null and b/config/logo/free/icon_32.png differ diff --git a/config/logo/free/icon_48.png b/config/logo/free/icon_48.png new file mode 100644 index 0000000000..6fb3a74b5d Binary files /dev/null and b/config/logo/free/icon_48.png differ diff --git a/config/logo/free/icon_512.png b/config/logo/free/icon_512.png new file mode 100644 index 0000000000..d8d30ad83f Binary files /dev/null and b/config/logo/free/icon_512.png differ diff --git a/config/logo/free/icon_72.png b/config/logo/free/icon_72.png new file mode 100644 index 0000000000..bfbd172006 Binary files /dev/null and b/config/logo/free/icon_72.png differ diff --git a/config/logo/parking/Osmand-Parking-logo.png b/config/logo/parking/Osmand-Parking-logo.png new file mode 100644 index 0000000000..3764063cea Binary files /dev/null and b/config/logo/parking/Osmand-Parking-logo.png differ diff --git a/config/logo/parking/headline_icon.png b/config/logo/parking/headline_icon.png new file mode 100644 index 0000000000..f30257f5e4 Binary files /dev/null and b/config/logo/parking/headline_icon.png differ diff --git a/config/logo/parking/icon.png b/config/logo/parking/icon.png new file mode 100644 index 0000000000..2e8518e716 Binary files /dev/null and b/config/logo/parking/icon.png differ diff --git a/config/logo/parking/icon_128.png b/config/logo/parking/icon_128.png new file mode 100644 index 0000000000..2e8518e716 Binary files /dev/null and b/config/logo/parking/icon_128.png differ diff --git a/config/logo/parking/icon_32.png b/config/logo/parking/icon_32.png new file mode 100644 index 0000000000..d73ad8d062 Binary files /dev/null and b/config/logo/parking/icon_32.png differ diff --git a/config/logo/parking/icon_48.png b/config/logo/parking/icon_48.png new file mode 100644 index 0000000000..60c575e989 Binary files /dev/null and b/config/logo/parking/icon_48.png differ diff --git a/config/logo/parking/icon_512.png b/config/logo/parking/icon_512.png new file mode 100644 index 0000000000..6991e562b9 Binary files /dev/null and b/config/logo/parking/icon_512.png differ diff --git a/config/logo/parking/icon_72.png b/config/logo/parking/icon_72.png new file mode 100644 index 0000000000..cfcda53358 Binary files /dev/null and b/config/logo/parking/icon_72.png differ diff --git a/config/site/resource/Android-screen-osmand-ver02.jpg b/config/site/resource/Android-screen-osmand-ver02.jpg deleted file mode 100755 index 14a25e5239..0000000000 Binary files a/config/site/resource/Android-screen-osmand-ver02.jpg and /dev/null differ diff --git a/config/site/resource/Osmand_map_cyclist.jpg b/config/site/resource/Osmand_map_cyclist.jpg deleted file mode 100644 index 833dac40b9..0000000000 Binary files a/config/site/resource/Osmand_map_cyclist.jpg and /dev/null differ diff --git a/config/site/resource/Osmand_map_pedestrian.jpg b/config/site/resource/Osmand_map_pedestrian.jpg deleted file mode 100644 index 6c11475368..0000000000 Binary files a/config/site/resource/Osmand_map_pedestrian.jpg and /dev/null differ diff --git a/config/site/resource/android-osmand-address.png b/config/site/resource/android-osmand-address.png index a062446942..14f5fce975 100644 Binary files a/config/site/resource/android-osmand-address.png and b/config/site/resource/android-osmand-address.png differ diff --git a/config/site/resource/android-osmand-basemap.png b/config/site/resource/android-osmand-basemap.png index 8a469f96d1..38c2f34f05 100644 Binary files a/config/site/resource/android-osmand-basemap.png and b/config/site/resource/android-osmand-basemap.png differ diff --git a/config/site/resource/android-osmand-directions.png b/config/site/resource/android-osmand-directions.png index 4286384972..2a0ff06fa4 100644 Binary files a/config/site/resource/android-osmand-directions.png and b/config/site/resource/android-osmand-directions.png differ diff --git a/config/site/resource/android-osmand-downloads.png b/config/site/resource/android-osmand-downloads.png new file mode 100644 index 0000000000..88fd245bd8 Binary files /dev/null and b/config/site/resource/android-osmand-downloads.png differ diff --git a/config/site/resource/android-osmand-enter_osmbug.png b/config/site/resource/android-osmand-enter_osmbug.png deleted file mode 100644 index f971668500..0000000000 Binary files a/config/site/resource/android-osmand-enter_osmbug.png and /dev/null differ diff --git a/config/site/resource/android-osmand-favorite.png b/config/site/resource/android-osmand-favorite.png index 2d026c4f1f..2ed12bd2cf 100644 Binary files a/config/site/resource/android-osmand-favorite.png and b/config/site/resource/android-osmand-favorite.png differ diff --git a/config/site/resource/android-osmand-filter_poi.png b/config/site/resource/android-osmand-filter_poi.png deleted file mode 100644 index c593838d00..0000000000 Binary files a/config/site/resource/android-osmand-filter_poi.png and /dev/null differ diff --git a/config/site/resource/android-osmand-map.png b/config/site/resource/android-osmand-map.png index f7512d6295..b2682274f6 100644 Binary files a/config/site/resource/android-osmand-map.png and b/config/site/resource/android-osmand-map.png differ diff --git a/config/site/resource/android-osmand-map_mode.png b/config/site/resource/android-osmand-map_mode.png new file mode 100644 index 0000000000..33d44cbcab Binary files /dev/null and b/config/site/resource/android-osmand-map_mode.png differ diff --git a/config/site/resource/android-osmand-menu.png b/config/site/resource/android-osmand-menu.png index e72b13725b..c714041059 100644 Binary files a/config/site/resource/android-osmand-menu.png and b/config/site/resource/android-osmand-menu.png differ diff --git a/config/site/resource/android-osmand-parking-time_limit.png b/config/site/resource/android-osmand-parking-time_limit.png new file mode 100644 index 0000000000..7318075ead Binary files /dev/null and b/config/site/resource/android-osmand-parking-time_limit.png differ diff --git a/config/site/resource/android-osmand-parking_choose.png b/config/site/resource/android-osmand-parking_choose.png new file mode 100644 index 0000000000..8d3fa9de31 Binary files /dev/null and b/config/site/resource/android-osmand-parking_choose.png differ diff --git a/config/site/resource/android-osmand-parking_map.png b/config/site/resource/android-osmand-parking_map.png new file mode 100644 index 0000000000..5a271ee25d Binary files /dev/null and b/config/site/resource/android-osmand-parking_map.png differ diff --git a/config/site/resource/android-osmand-parking_tooltip.png b/config/site/resource/android-osmand-parking_tooltip.png new file mode 100644 index 0000000000..3c0b6a1d85 Binary files /dev/null and b/config/site/resource/android-osmand-parking_tooltip.png differ diff --git a/config/site/resource/android-osmand-pedestrian.png b/config/site/resource/android-osmand-pedestrian.png index f6ccb97849..ab93dcd1d0 100644 Binary files a/config/site/resource/android-osmand-pedestrian.png and b/config/site/resource/android-osmand-pedestrian.png differ diff --git a/config/site/resource/android-osmand-plugins.png b/config/site/resource/android-osmand-plugins.png new file mode 100644 index 0000000000..7d46c5bddc Binary files /dev/null and b/config/site/resource/android-osmand-plugins.png differ diff --git a/config/site/resource/android-osmand-poi-search.png b/config/site/resource/android-osmand-poi-search.png new file mode 100644 index 0000000000..a65f53be64 Binary files /dev/null and b/config/site/resource/android-osmand-poi-search.png differ diff --git a/config/site/resource/android-osmand-routing.png b/config/site/resource/android-osmand-routing.png index 574cd0f652..af8cb1fd14 100644 Binary files a/config/site/resource/android-osmand-routing.png and b/config/site/resource/android-osmand-routing.png differ diff --git a/config/site/resource/android-osmand-routing_limits.png b/config/site/resource/android-osmand-routing_limits.png new file mode 100644 index 0000000000..22c026c548 Binary files /dev/null and b/config/site/resource/android-osmand-routing_limits.png differ diff --git a/config/site/resource/android-osmand-routing_night.png b/config/site/resource/android-osmand-routing_night.png new file mode 100644 index 0000000000..6d41f79d2c Binary files /dev/null and b/config/site/resource/android-osmand-routing_night.png differ diff --git a/config/site/resource/android-osmand-screen_poi.png b/config/site/resource/android-osmand-screen_poi.png index 35f7e5c12f..0697bee257 100644 Binary files a/config/site/resource/android-osmand-screen_poi.png and b/config/site/resource/android-osmand-screen_poi.png differ diff --git a/config/site/resource/android-osmand-search_poi.png b/config/site/resource/android-osmand-search_poi.png new file mode 100644 index 0000000000..68df9e376d Binary files /dev/null and b/config/site/resource/android-osmand-search_poi.png differ diff --git a/config/site/resource/android-osmand-settings.png b/config/site/resource/android-osmand-settings.png index 84a46a6b0e..b8044d4214 100644 Binary files a/config/site/resource/android-osmand-settings.png and b/config/site/resource/android-osmand-settings.png differ diff --git a/config/site/resource/android-osmand-specify_point.png b/config/site/resource/android-osmand-specify_point.png deleted file mode 100644 index e303cd1533..0000000000 Binary files a/config/site/resource/android-osmand-specify_point.png and /dev/null differ diff --git a/config/site/resource/android-osmand-target_menu.png b/config/site/resource/android-osmand-target_menu.png index 083d59b98f..f2015c8085 100644 Binary files a/config/site/resource/android-osmand-target_menu.png and b/config/site/resource/android-osmand-target_menu.png differ diff --git a/config/site/resource/android-osmand-transport.png b/config/site/resource/android-osmand-transport.png index a9d95d1d19..86a45d03c3 100644 Binary files a/config/site/resource/android-osmand-transport.png and b/config/site/resource/android-osmand-transport.png differ diff --git a/config/site/resource/android-osmand-velcom-yandex_traffic.png b/config/site/resource/android-osmand-velcom-yandex_traffic.png deleted file mode 100644 index 5ddf4b6747..0000000000 Binary files a/config/site/resource/android-osmand-velcom-yandex_traffic.png and /dev/null differ diff --git a/config/site/resource/android-osmand-velcom.png b/config/site/resource/android-osmand-velcom.png deleted file mode 100644 index 72809dd754..0000000000 Binary files a/config/site/resource/android-osmand-velcom.png and /dev/null differ diff --git a/config/site/resource/osmand-address.png b/config/site/resource/osmand-address.png deleted file mode 100644 index 2448bb5e4a..0000000000 Binary files a/config/site/resource/osmand-address.png and /dev/null differ diff --git a/config/site/resource/osmand-main-screen.png b/config/site/resource/osmand-main-screen.png deleted file mode 100644 index 3612e22938..0000000000 Binary files a/config/site/resource/osmand-main-screen.png and /dev/null differ diff --git a/config/site/resource/osmand-map-future.jpg b/config/site/resource/osmand-map-future.jpg deleted file mode 100755 index 1aa6d52ce2..0000000000 Binary files a/config/site/resource/osmand-map-future.jpg and /dev/null differ diff --git a/config/site/resource/osmand-map.png b/config/site/resource/osmand-map.png deleted file mode 100644 index 7fa386586a..0000000000 Binary files a/config/site/resource/osmand-map.png and /dev/null differ diff --git a/config/site/resource/osmand-poi-search.png b/config/site/resource/osmand-poi-search.png deleted file mode 100644 index b4296fcbae..0000000000 Binary files a/config/site/resource/osmand-poi-search.png and /dev/null differ diff --git a/config/site/resource/osmand-routing.png b/config/site/resource/osmand-routing.png deleted file mode 100644 index e37cc327ee..0000000000 Binary files a/config/site/resource/osmand-routing.png and /dev/null differ diff --git a/config/site/resource/osmand-yandex_traffic.png b/config/site/resource/osmand-yandex_traffic.png deleted file mode 100755 index 5ddf4b6747..0000000000 Binary files a/config/site/resource/osmand-yandex_traffic.png and /dev/null differ diff --git a/plugins/Osmand-ParkingPlugin/AndroidManifest.xml b/plugins/Osmand-ParkingPlugin/AndroidManifest.xml index a51066317c..e8f12d2886 100644 --- a/plugins/Osmand-ParkingPlugin/AndroidManifest.xml +++ b/plugins/Osmand-ParkingPlugin/AndroidManifest.xml @@ -1,14 +1,14 @@ + android:label="OsmAnd Parking" > diff --git a/plugins/Osmand-ParkingPlugin/res/drawable-hdpi/icon.png b/plugins/Osmand-ParkingPlugin/res/drawable-hdpi/icon.png index a4f76f9354..cfcda53358 100644 Binary files a/plugins/Osmand-ParkingPlugin/res/drawable-hdpi/icon.png and b/plugins/Osmand-ParkingPlugin/res/drawable-hdpi/icon.png differ diff --git a/plugins/Osmand-ParkingPlugin/res/drawable-ldpi/icon.png b/plugins/Osmand-ParkingPlugin/res/drawable-ldpi/icon.png index 120a5c1bb0..60c575e989 100644 Binary files a/plugins/Osmand-ParkingPlugin/res/drawable-ldpi/icon.png and b/plugins/Osmand-ParkingPlugin/res/drawable-ldpi/icon.png differ diff --git a/plugins/Osmand-ParkingPlugin/res/drawable-mdpi/icon.png b/plugins/Osmand-ParkingPlugin/res/drawable-mdpi/icon.png index 120a5c1bb0..60c575e989 100644 Binary files a/plugins/Osmand-ParkingPlugin/res/drawable-mdpi/icon.png and b/plugins/Osmand-ParkingPlugin/res/drawable-mdpi/icon.png differ diff --git a/plugins/Osmand-ParkingPlugin/res/drawable-xhdpi/icon.png b/plugins/Osmand-ParkingPlugin/res/drawable-xhdpi/icon.png index a4f76f9354..2e8518e716 100644 Binary files a/plugins/Osmand-ParkingPlugin/res/drawable-xhdpi/icon.png and b/plugins/Osmand-ParkingPlugin/res/drawable-xhdpi/icon.png differ diff --git a/plugins/Osmand-ParkingPlugin/res/values/strings.xml b/plugins/Osmand-ParkingPlugin/res/values/strings.xml index d2df6e8874..b357fa43bd 100644 --- a/plugins/Osmand-ParkingPlugin/res/values/strings.xml +++ b/plugins/Osmand-ParkingPlugin/res/values/strings.xml @@ -3,6 +3,6 @@ No Yes Osmand is not installed - OsmAnd Parking Plugin + OsmAnd Parking OsmAnd Parking Plugin is installed and enabled in OsmAnd settings. \ No newline at end of file