From d6cbfa18f869d0c49a293c75c40e1b37723191c6 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Tue, 31 Mar 2015 01:21:57 +0200
Subject: [PATCH 1/4] Update rotate drawable

---
 OsmAnd/res/layout/dash_parking_fragment.xml   |  2 +-
 OsmAnd/res/values-large/sizes.xml             |  2 +-
 .../plus/dashboard/DashLocationFragment.java  |  6 +----
 .../parkingpoint/DashParkingFragment.java     |  8 +++++-
 .../osmand/plus/views/DirectionDrawable.java  | 25 ++++++++++---------
 5 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/OsmAnd/res/layout/dash_parking_fragment.xml b/OsmAnd/res/layout/dash_parking_fragment.xml
index 9abda1a58a..db362acbee 100644
--- a/OsmAnd/res/layout/dash_parking_fragment.xml
+++ b/OsmAnd/res/layout/dash_parking_fragment.xml
@@ -21,7 +21,7 @@
 			android:layout_marginLeft="@dimen/dashboard_parking_left_margin"
 			android:layout_marginRight="@dimen/dashFavIconMargin"
 			android:src="@drawable/ic_action_start_navigation"
-			android:scaleType="center"
+			android:scaleType="centerInside"
 			android:background="@drawable/btn_inset_circle_no_shadow"/>
 
 		<LinearLayout
diff --git a/OsmAnd/res/values-large/sizes.xml b/OsmAnd/res/values-large/sizes.xml
index abf3578b21..323ce31242 100644
--- a/OsmAnd/res/values-large/sizes.xml
+++ b/OsmAnd/res/values-large/sizes.xml
@@ -18,7 +18,7 @@
 	
 	<dimen name="map_alarm_bottom_margin">140dp</dimen>
 	<dimen name="map_alarm_bottom_margin_land">78dp</dimen>
-	<dimen name="map_button_shadow_height">127dp</dimen>
+	<dimen name="map_button_shadow_height">112dp</dimen>
 	<dimen name="map_widget_icon">32dp</dimen>
 	<dimen name="map_widget_height">48dp</dimen>
 	<dimen name="map_widget_image">120dp</dimen>
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashLocationFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashLocationFragment.java
index a6028a1847..1b7e133e98 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashLocationFragment.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashLocationFragment.java
@@ -134,11 +134,7 @@ public abstract class DashLocationFragment extends DashBaseFragment {
 				arrowResId = R.drawable.ic_destination_arrow_white;
 			}
 			DirectionDrawable dd = (DirectionDrawable) arrow.getDrawable();
-			if (paint) {
-				dd.setImage(arrowResId, useCenter ? R.color.color_distance : R.color.color_myloc_distance);
-			} else {
-				dd.setImage(arrowResId, useCenter ? R.color.color_distance : R.color.color_white);
-			}
+			dd.setImage(arrowResId, useCenter ? R.color.color_distance : R.color.color_myloc_distance);
 			if (fromLoc == null || h == null) {
 				dd.setAngle(0);
 			} else {
diff --git a/OsmAnd/src/net/osmand/plus/parkingpoint/DashParkingFragment.java b/OsmAnd/src/net/osmand/plus/parkingpoint/DashParkingFragment.java
index 473ddefe7a..b303936966 100644
--- a/OsmAnd/src/net/osmand/plus/parkingpoint/DashParkingFragment.java
+++ b/OsmAnd/src/net/osmand/plus/parkingpoint/DashParkingFragment.java
@@ -4,6 +4,7 @@ import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.graphics.Color;
 import android.graphics.Typeface;
+import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -11,7 +12,6 @@ import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.TextView;
-
 import net.osmand.data.LatLon;
 import net.osmand.data.PointDescription;
 import net.osmand.plus.OsmandPlugin;
@@ -19,6 +19,7 @@ import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.dashboard.DashLocationFragment;
 import net.osmand.plus.helpers.FontCache;
+import net.osmand.plus.views.DirectionDrawable;
 
 import java.util.Calendar;
 
@@ -113,6 +114,11 @@ public class DashParkingFragment extends DashLocationFragment {
 		ImageView direction = (ImageView) mainView.findViewById(R.id.direction_icon);
 		if (loc != null) {
 			DashLocationView dv = new DashLocationView(direction, (TextView) mainView.findViewById(R.id.distance), position);
+//			Drawable dds = getMyApplication().getIconsCache().getIcon(R.drawable.ic_action_start_navigation,
+//					R.color.color_distance);
+//			DirectionDrawable dd = new DirectionDrawable(mainView.getContext(), 
+//					dds.getIntrinsicWidth(), dds.getIntrinsicHeight());
+//			direction.setImageDrawable(dd);
 			dv.paint = false;
 			dv.arrowResId = R.drawable.ic_action_start_navigation;
 			distances.add(dv);
diff --git a/OsmAnd/src/net/osmand/plus/views/DirectionDrawable.java b/OsmAnd/src/net/osmand/plus/views/DirectionDrawable.java
index 23ca77a6b1..94593f415f 100644
--- a/OsmAnd/src/net/osmand/plus/views/DirectionDrawable.java
+++ b/OsmAnd/src/net/osmand/plus/views/DirectionDrawable.java
@@ -35,13 +35,12 @@ public class DirectionDrawable extends Drawable {
 		this.resourceId = resourceId;
 	}
 
-	public void setImage(int resourceId){
+	public void setImage(int resourceId) {
 		IconsCache iconsCache = ((OsmandApplication) ctx.getApplicationContext()).getIconsCache();
 		arrowImage = iconsCache.getIcon(resourceId, 0);
 		this.resourceId = resourceId;
 	}
-
-
+	
 	public DirectionDrawable(Context ctx, float width, float height) {
 		this.ctx = ctx;
 		this.width = width;
@@ -77,21 +76,23 @@ public class DirectionDrawable extends Drawable {
 
 	@Override
 	public void draw(Canvas canvas) {
+		canvas.save();
+		
 		if (arrowImage != null) {
-			canvas.rotate(angle, canvas.getHeight() / 2, canvas.getWidth() / 2);
-			arrowImage.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
+			int w = arrowImage.getIntrinsicWidth();
+			int h = arrowImage.getIntrinsicHeight();
+			int dx = canvas.getWidth() - w;
+			int dy = canvas.getHeight() - h;
+			arrowImage.setBounds(0, 0, w, h);
+			canvas.rotate(angle, canvas.getWidth() / 2, canvas.getHeight() / 2);
+			canvas.translate(dx/2, dy/2);
 			arrowImage.draw(canvas);
-			// TODO delete?
-//			Bitmap arrow = Bitmap.createBitmap(canvas.getWidth(), canvas.getHeight(), Bitmap.Config.ARGB_8888);
-//			Canvas canv = new Canvas(arrow);
-//			arrowImage.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
-//			arrowImage.draw(canv);
-//			canvas.drawBitmap(arrow, null, new Rect(0, 0, arrow.getHeight(), arrow.getWidth()), null);
 		} else {
-			canvas.rotate(angle, canvas.getHeight()/2, canvas.getWidth() / 2);
+			canvas.rotate(angle, canvas.getWidth() / 2, canvas.getHeight() / 2);
 			Path directionPath = createDirectionPath();
 			canvas.drawPath(directionPath, paintRouteDirection);
 		}
+		canvas.restore();
 	}
 
 	@Override

From d83ecbc50776eee78e50c7cc0a00bd8eb1455789 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Wed, 1 Apr 2015 15:38:27 +0200
Subject: [PATCH 2/4] Parking drawable

---
 OsmAnd/res/layout/dash_parking_fragment.xml   |  2 +-
 .../parkingpoint/DashParkingFragment.java     |  7 +-----
 .../osmand/plus/views/DirectionDrawable.java  | 22 ++++++++++++++++---
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/OsmAnd/res/layout/dash_parking_fragment.xml b/OsmAnd/res/layout/dash_parking_fragment.xml
index db362acbee..9abda1a58a 100644
--- a/OsmAnd/res/layout/dash_parking_fragment.xml
+++ b/OsmAnd/res/layout/dash_parking_fragment.xml
@@ -21,7 +21,7 @@
 			android:layout_marginLeft="@dimen/dashboard_parking_left_margin"
 			android:layout_marginRight="@dimen/dashFavIconMargin"
 			android:src="@drawable/ic_action_start_navigation"
-			android:scaleType="centerInside"
+			android:scaleType="center"
 			android:background="@drawable/btn_inset_circle_no_shadow"/>
 
 		<LinearLayout
diff --git a/OsmAnd/src/net/osmand/plus/parkingpoint/DashParkingFragment.java b/OsmAnd/src/net/osmand/plus/parkingpoint/DashParkingFragment.java
index b303936966..ff3aca7f94 100644
--- a/OsmAnd/src/net/osmand/plus/parkingpoint/DashParkingFragment.java
+++ b/OsmAnd/src/net/osmand/plus/parkingpoint/DashParkingFragment.java
@@ -114,13 +114,8 @@ public class DashParkingFragment extends DashLocationFragment {
 		ImageView direction = (ImageView) mainView.findViewById(R.id.direction_icon);
 		if (loc != null) {
 			DashLocationView dv = new DashLocationView(direction, (TextView) mainView.findViewById(R.id.distance), position);
-//			Drawable dds = getMyApplication().getIconsCache().getIcon(R.drawable.ic_action_start_navigation,
-//					R.color.color_distance);
-//			DirectionDrawable dd = new DirectionDrawable(mainView.getContext(), 
-//					dds.getIntrinsicWidth(), dds.getIntrinsicHeight());
-//			direction.setImageDrawable(dd);
 			dv.paint = false;
-			dv.arrowResId = R.drawable.ic_action_start_navigation;
+			dv.arrowResId = R.drawable.ic_action_start_navigation; 
 			distances.add(dv);
 		}
 
diff --git a/OsmAnd/src/net/osmand/plus/views/DirectionDrawable.java b/OsmAnd/src/net/osmand/plus/views/DirectionDrawable.java
index 94593f415f..69d84584eb 100644
--- a/OsmAnd/src/net/osmand/plus/views/DirectionDrawable.java
+++ b/OsmAnd/src/net/osmand/plus/views/DirectionDrawable.java
@@ -73,19 +73,35 @@ public class DirectionDrawable extends Drawable {
 	public void setAngle(float angle) {
 		this.angle = angle;
 	}
+	
+
+	@Override
+	public int getIntrinsicWidth() {
+		if (arrowImage != null) {
+			return arrowImage.getIntrinsicWidth();
+		}
+		return super.getIntrinsicWidth();
+	}
+	
+	@Override
+	public int getIntrinsicHeight() {
+		if (arrowImage != null) {
+			return arrowImage.getIntrinsicHeight();
+		}
+		return super.getIntrinsicHeight();
+	}
 
 	@Override
 	public void draw(Canvas canvas) {
 		canvas.save();
-		
 		if (arrowImage != null) {
 			int w = arrowImage.getIntrinsicWidth();
 			int h = arrowImage.getIntrinsicHeight();
 			int dx = canvas.getWidth() - w;
 			int dy = canvas.getHeight() - h;
 			arrowImage.setBounds(0, 0, w, h);
-			canvas.rotate(angle, canvas.getWidth() / 2, canvas.getHeight() / 2);
-			canvas.translate(dx/2, dy/2);
+			canvas.rotate(angle, w / 2, h / 2);
+			canvas.translate(dx / 3, dy / 3);
 			arrowImage.draw(canvas);
 		} else {
 			canvas.rotate(angle, canvas.getWidth() / 2, canvas.getHeight() / 2);

From f10768371f323d4c9c61f2ba5e720bfe2c07e52b Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Wed, 1 Apr 2015 16:15:08 +0200
Subject: [PATCH 3/4] Update icons

---
 ..._widget_gpx.png => ic_action_altitude.png} | Bin 1242 -> 1289 bytes
 ...et_gps_info.png => ic_action_gps_info.png} | Bin
 .../ic_action_speed.png}                      | Bin 1387 -> 1353 bytes
 OsmAnd/res/drawable-mdpi/ic_action_time.png   | Bin 0 -> 1379 bytes
 .../ic_action_time_to_distance.png            | Bin 0 -> 1388 bytes
 .../res/drawable-xhdpi/ic_action_altitude.png | Bin 0 -> 1577 bytes
 ...et_gps_info.png => ic_action_gps_info.png} | Bin
 OsmAnd/res/drawable-xhdpi/ic_action_speed.png | Bin 0 -> 1784 bytes
 OsmAnd/res/drawable-xhdpi/ic_action_time.png  | Bin 0 -> 1801 bytes
 .../ic_action_time_to_distance.png            | Bin 0 -> 1944 bytes
 OsmAnd/res/drawable-xhdpi/ic_widget_gpx.png   | Bin 1531 -> 0 bytes
 .../drawable-xxhdpi/ic_action_altitude.png    | Bin 0 -> 1947 bytes
 ...et_gps_info.png => ic_action_gps_info.png} | Bin
 .../res/drawable-xxhdpi/ic_action_speed.png   | Bin 0 -> 2276 bytes
 OsmAnd/res/drawable-xxhdpi/ic_action_time.png | Bin 0 -> 2388 bytes
 .../ic_action_time_to_distance.png            | Bin 0 -> 2394 bytes
 OsmAnd/res/drawable-xxhdpi/ic_widget_gpx.png  | Bin 1890 -> 0 bytes
 OsmAnd/res/layout/drawer_list_item.xml        |   2 +-
 OsmAnd/res/layout/osmo_create_group.xml       |   2 +-
 .../net/osmand/plus/helpers/GpxUiHelper.java  |   2 +-
 .../osmand/plus/osmo/OsMoGroupsActivity.java  |   4 ++--
 .../plus/sherpafy/SherpafyCustomization.java  |   4 ++--
 .../osmand/plus/views/MapControlsLayer.java   |   2 +-
 23 files changed, 8 insertions(+), 8 deletions(-)
 rename OsmAnd/res/drawable-mdpi/{ic_widget_gpx.png => ic_action_altitude.png} (60%)
 rename OsmAnd/res/drawable-mdpi/{widget_gps_info.png => ic_action_gps_info.png} (100%)
 rename OsmAnd/res/{drawable-hdpi/ic_widget_gpx.png => drawable-mdpi/ic_action_speed.png} (51%)
 create mode 100644 OsmAnd/res/drawable-mdpi/ic_action_time.png
 create mode 100644 OsmAnd/res/drawable-mdpi/ic_action_time_to_distance.png
 create mode 100644 OsmAnd/res/drawable-xhdpi/ic_action_altitude.png
 rename OsmAnd/res/drawable-xhdpi/{widget_gps_info.png => ic_action_gps_info.png} (100%)
 create mode 100644 OsmAnd/res/drawable-xhdpi/ic_action_speed.png
 create mode 100644 OsmAnd/res/drawable-xhdpi/ic_action_time.png
 create mode 100644 OsmAnd/res/drawable-xhdpi/ic_action_time_to_distance.png
 delete mode 100644 OsmAnd/res/drawable-xhdpi/ic_widget_gpx.png
 create mode 100644 OsmAnd/res/drawable-xxhdpi/ic_action_altitude.png
 rename OsmAnd/res/drawable-xxhdpi/{widget_gps_info.png => ic_action_gps_info.png} (100%)
 create mode 100644 OsmAnd/res/drawable-xxhdpi/ic_action_speed.png
 create mode 100644 OsmAnd/res/drawable-xxhdpi/ic_action_time.png
 create mode 100644 OsmAnd/res/drawable-xxhdpi/ic_action_time_to_distance.png
 delete mode 100644 OsmAnd/res/drawable-xxhdpi/ic_widget_gpx.png

diff --git a/OsmAnd/res/drawable-mdpi/ic_widget_gpx.png b/OsmAnd/res/drawable-mdpi/ic_action_altitude.png
similarity index 60%
rename from OsmAnd/res/drawable-mdpi/ic_widget_gpx.png
rename to OsmAnd/res/drawable-mdpi/ic_action_altitude.png
index 44a32bd8f289ca593a2d7f98ccc2b41bed184ddc..aa795794c8abc19f3f1f4983367f30178f1ef4aa 100644
GIT binary patch
delta 360
zcmV-u0hj*T35g1@Ujhd*MMXtHIX9DL0yPIRMMXtHIX1JR0wMu_O~{*`0003gNkl<Z
zc-mt8|NlP&Eddh)jlrk|G_yb&h^NuY0#+bi0mPX=>_rO;+JM*w%ANwmoOo4(@&O4r
z0Eqtq@lPPW`yT>Y@#(>5m>CcUBk`4h_yg3?LLfE=;=fSKG)c998Hmq7HM;;Y2N0iw
z8omaI8KLT?L&Xk%Ac+xWLH2(H_zJ{Zq3qj0%#Wl_5Qtww<>H97Kmv&0Lp2>ivgjKS
z8(>i%1C@UT#6rYauo$XgGc>5yLix!!d<zPiy-+nX30dF(O(mdUQG|-I0dWq2)TIu@
zKcIT8a9O|##MhuMsUk7?f^Z8|??oVH!Dc}@RKX1(W+%f(0#Hi312v-<Ce8@0aO8ma
z8W3|+sf_yq#9Bc77*<qFqN3p-zymcC?t{?^XBb-m5MTi0>&*+xcFM*80000<MNUMn
GLSTX@-I9|4

delta 313
zcmV-90mlA`3fc*<Ujhd)MnghHGeVPQ0yPIQMnghHGeNVW0wMu_0{zKz0002`Nkl<Z
zc-rihK?=e!5Jj7fxYCtkaV_?&f?~yMWN9y@*w!8(PGAPYm}D9n7lH#1+8>%9e$t6D
z#uVQy_45XWH3+Z+G|(d&wIYSkz#eGLXSFys*+Aoj4NxKtYC4BOkCT;-R-!iKFrbq3
zIdH`VbwCZwavIcso_#vG--M1SiAvCWVBx&m@dvPy{)4dw9k65ucVHd*4=7VAo+*#$
z;ECuM+XE?6ZeYzXj(+Bw%p;OA9UEP+7fG2W8}NvvOvfJI;2uz>w&y%OnNBv4@U@Ul
ztc9c+P!qi2#9Mq0Ho;VbD$>TQ90qh(*wwxe9lImc|I(Kj>Mg(kiOzU)HQQY!00000
LNkvXXu0mjfqY#Hw

diff --git a/OsmAnd/res/drawable-mdpi/widget_gps_info.png b/OsmAnd/res/drawable-mdpi/ic_action_gps_info.png
similarity index 100%
rename from OsmAnd/res/drawable-mdpi/widget_gps_info.png
rename to OsmAnd/res/drawable-mdpi/ic_action_gps_info.png
diff --git a/OsmAnd/res/drawable-hdpi/ic_widget_gpx.png b/OsmAnd/res/drawable-mdpi/ic_action_speed.png
similarity index 51%
rename from OsmAnd/res/drawable-hdpi/ic_widget_gpx.png
rename to OsmAnd/res/drawable-mdpi/ic_action_speed.png
index bb4a04413fee05604fd317e021218b5d80079fa6..a6de19816eea648959f39eee687eaf554b6b528f 100644
GIT binary patch
delta 510
zcmaFOb&^Z5Gr-TCmrII^fq{Y7)59eQNK1e)2OE%lP;UEUqoOU7g0qpStC6LFle3G3
zsiC2(iKUs7p|gpxqqD1{p_7q`+2lGV8JHqRT#7dDV&Y<~-}{u|4+8^Zrl*TzNX4x;
zQ+InYJ4&?PO_B7@R#dpL)FU%BdAgIq0<lI1u8W711jOVO?Ru7N*tF>*ql=(vZiypn
zE#u~cvF8s-&gl7{qMx*sS)Tj<(>Zf*ubZxN@=!kC`}+@;vvF-XU>3oAI)Q86K~W3l
z=RGHtO$#=#&YSe+<B9sHKzFWXo243NFew+XNF{WdNJwu~OY5J0JmJ7H4weJ+jlJia
z3Rd@R=83AA&6#mda9idk^<`}t3l7Z4zof0O?xke)B9-QC8=uv+MX<hU<j&qHx8mY7
z9>1A9Mn|q6G|lE;8*|`CXUc-<%ijsyW6?kMaSvnY>SgEdL>T=@D7u*Vp+0Tyf8K>|
zhUOPHb`?HXs{LM6!+7uD(#Oxv^IU!~^?Yc1hIq@8*DE47Zb_S#apL7yZ<#>f`BKiA
z{8m2qxMxpq-}1aqO7^-dcVt1pp@jK+7rtJ!^i4x_fOcX)^80m?)BmxbvIulNzWv_*
k@BZtW&MWc8Gx0DqER#D|ArSf;7^4gvp00i_>zopr07Z_^L;wH)

delta 544
zcmX@f^_okuGr-TCmrII^fq{Y7)59eQNUMM_2OE%l$S`BZMnzjD1t$X+BXd&=6K59-
zQ$s^n6AKGd3nxP}H)As=OE)to$H{d}GB8EPxD;*P#l*!}|0J}fn1O+@+tbA{q~g|_
z=?A?II|#H*4hmYS{`H0PmC5^>_c@4vRIAFW`XcD88KJ8xcf|cdcc_QUqx}Yr3svsk
zeN)yusj)w&ti5d4=l3P*I$cT`lfO1iixj`GpHG9y(Bpvh#0xP`bd)MjnOLxOFS;l8
zMEHhKmQ3}}*Xa*j9@c;7IOnkK^_07t5{e91-5*RiX1TWaKyUvPRUOmIU0<!Y&HLdI
zdCWz-{8?^t?7J)4pYLwIsW7);hjYfm%d4zZ9Juzq)XXtCvbOVls_#mH(D_f57fgA!
z^hf&}fhE4KxvLlIUts_JK$zzs`_%4(`57-}&J*TJb9%4uYob!}X`RQ+74;V{+z4@2
zOA2}E^MYkD*9n)NZHKN4ZS9npD|&vOv0>E?{+S&YBTtq1-4s6IY5iDM)PM1z6<aUb
znWQBBJXWf*V#lH>+rE9wuRnh*T=ezzoIOQ_C&LAeYg4||IUF$wk9y<m%$&vI#<gG7
z;_fw$9bPm4G;x1e@WSid)Y#6&Q>MCH(c(CBaMp~=F;8Aiy8rcCtV6xl0(nL@hOKwQ
V<2G*R*$Rww22WQ%mvv4FO#odI>x2LR

diff --git a/OsmAnd/res/drawable-mdpi/ic_action_time.png b/OsmAnd/res/drawable-mdpi/ic_action_time.png
new file mode 100644
index 0000000000000000000000000000000000000000..bcb67a5fa35fab145b85d5e02e0aa2327e2efdeb
GIT binary patch
literal 1379
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gjk|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+n9DLlB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxOgGuU&_u!9QqR!T
z%-qskN5Kfl*Eg`xH!{#Qu(UEYwlXkMfC43;ZAB?*RzWUqP`iLUTcwPWk^(Dz{qpj1
zy>er{{GxPyLrY6beFGzXBO_g)3f<z$ypqHU-MnIDm<cYa#mPmP1tppJc?uvC6O-~w
zOKg>ZE`@j@x4_pIZg5^PG@yV%reBd*pl_&Wpr4xy@)uZjaY;}r!Wmdq7l%|9r0NHy
z7U!21B?IFlO&O*c7<TwA0x1N##>&4a6BsFpIWGChrManjC7v#}N<bOCl*|+>vosTP
zBLfo)-BeREBV9`i6JuQqQ^OQpQ)4s3RHM{H1Jh(fm^s+=I~$q08d(|`JG%h28M>NS
znmHLdn;1JfyE+;=8JU>D^m^tMmn7yTr^4*c1lkSNYlK&?m2**QVo82cNPd0}EENP~
z<d@_ZXXF<sI6H%5T|px}GcP5-yjT+yO%PwZq!wkCrKY$Q<>xAZ!`UhmiyKlclTD4y
z%`A13%nTECO%hEEbuE%i4S~U7X^@y?Zj@?amaGKTpF(c<=>r|54@xXZi3cVGOpzca
zJSzY>@XVB&2h2f5z^tO-p(?<@z}W2R;uunK>&mo^Ud)aHZN-Act^Nx%S)`Sxg<bo_
z(D_V@)mu^Xiqi+tNnzgEvpF6~--zry8Y`8{qHNb7;G?kS|H=Iuw%<E<H`68NhsBJ!
zf7|EIy=m*O8T#w&!@s2sTq`D*ZeTc;!0_&%=#FK&wMQ6bOb#qQCAabXG;j5@7R**{
z4)QXMQXfuo<<=fve|YOm#w|ZMwm3%KNVVC{-{vM@=x|x!zDP^1*$%frWm5-Mo69Rh
z9bzs&yT!P5AIpt}&Qqp&FKU1NM(N!9tm>N@E3EcEPx#b3X@0@ll~ZpV6kdG2#l*u}
zqj2q_Ys=5(Y$<;r9R4^X-9O`u;PvBHog%&5OOoR_CP<_;gx5`Hc^F+Mf1t4I!J?&8
zEt=&%muoz+(AzKk!R@|u_P>U2-Yb2a7y6in7BGHWW5oN`Xl~l#tvzm^W5ZnyT30Kb
z*!5<Y{f;-gD%ZabUc6FC?w-*M*5ZVz+b(>tK3yG~y^Y((!gspgJauCR-VJQ4w(M`P
mwwr0Y(sOV9|L~8B2N)iUm(MyBcq|4~?0LHSxvX<aXaWGVFXk=)

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-mdpi/ic_action_time_to_distance.png b/OsmAnd/res/drawable-mdpi/ic_action_time_to_distance.png
new file mode 100644
index 0000000000000000000000000000000000000000..4d06fe0548f76571323cfd0661d8c9c6eb3e2190
GIT binary patch
literal 1388
zcmbVMeM}o=7(e7=1BM|AMu@V@jp62cy^prn-a&!VcC6Dv(=~xVoZ))+(q5o<^?J|(
zgCH?+GgCL>5J#3(Gj+zeY$_P1h{+5K_%WR<BS<zP_z}YfY$h^erf-3we~|s*C3o-p
zyzldSK7P;h+#yd*bxu}c7J?u-u00MfTpv!nn={~dCTd-VOM&LB*Y+umT9j7-ViOfV
zKwTj|0K9+~+nyN%WeAemD*5WQdiRr@poH{%LPsA9g&`V2$|_=EUT6Xu>IVTywqgsP
zj9{oFTCqBln{<cmASmr=SHZsa8lTYKB(Ne@QI3|yIA|aQG#-tGn&k)=vtlcDIk-<8
z6BxRpqBU8u)u8I#9@MU=05$0uTp%eUYG(D6i7~Tg9ZEx)AT0z<;v~zN3>-<LYYzs!
zsbVANb?jdA1tlvM)U+^15YcE<A2sL|H9$}-%Mv6_&@>J;@JO4i@iAPEY)e{jfQX<<
zVNFtGG+~kVD=nH8gORSL5DL59>xSjX8c~okBF2XaN>37@P$I7t?TF?D|Aw)lcEr~f
z280(xlonNh^=RCd1Virb?I@uLqv2{*2^NKKb|^wi2*{etVa4E$UX(<RX*8N?(rCef
ziJ@`UVl?0u6D8s%1498C@T5tgl6E%2+i8=NW=XT%0b!KW$TC%w-Dt4coi?h9HZn=9
zOO9x~EP$kM3Hn~cGWW!Cb`|iNqWTo2IoSoCprR>}pb|#y_LZumJL)7^RHBici88Hb
z?EtFO3dG&25<*va=A;c`0IXm#m>CxLGZc>-c_W2e{3Z(0!IHe+OalueU~72s|MEw`
zpom1X{HJ-6N3bIk+x1a^!ul`)8BUN2N2TlL6%s*G4!aySUu<fkZ)9((Eq8PwE&tNw
zPr1}Fbnb|@lryi>4KAhR>2Bx_XO!AXw-YlbN5}V`J@R{Nl}9&G@}6Tj9_`A$KKAqE
z@W3vwWl;zO0@3#krPb4xmrn5G2Myv_7MXK=rs%nN?eLiCwbOY8_2~=e_D@Wm2Mb8a
zY~jHl4;=b+px|?N{>S$fRl54Si%$2{NjXDVkDL*EJHBu}%`88avh^!(G_B)q@rgGG
zQjWRz|MuBik6kv;pSy;RcW4<u)E>=i*;4*?d`n~HmuIi-yu7Kp=a)OS5$DXa-(j7e
zOYC0-6U8}wSAx;L3l+A?lbPQlFQapl@y?mD?>`D&?EU&d=JieTWW%n87ldQ2wYTu|
z%yj&lL2LM(JEO<D?r**AJ=LE&?CYNU^YKTs`;hUw#hLNRp)?P>^@(%~0;Vo}T3D=Z
zmIvEjoXzgPI$wVAp&LqXVX?3B)sb8ML!DuMsbaS2fj4*XnFl^7+0N7rJfGhDVfSt3
qYIeG(x!WDm-%S1E`rq#^=QkjW)32Ob6w%zo|Ig*Dah$1Y==lffG3pKg

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_altitude.png b/OsmAnd/res/drawable-xhdpi/ic_action_altitude.png
new file mode 100644
index 0000000000000000000000000000000000000000..bd013ee05f5e24e1bc29feb02592a1dc3a7e2b44
GIT binary patch
literal 1577
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%w?G&5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;TrkiYFXrf?lsb^?v
zW^QS&qhJK&>l;|;8yV;tSX!AHTNxNBK!Fm_wxX0Ys~{IQs9ivwtx`rwNr9EVetCJh
zUb(Seeo?x<p{1pzzJZaxk&!M?g>G?WUP)qwZeFo6%mkOz;^d;tf|AVqJOz-6iAnjT
zCALaHmqNUdTj1*pH#n~t8c@I>)2~P@&^OdG(9g{U`3tPNxFjeQ;S8**i$f|4QuTvU
zi}Op1l7aD&rVP^z3_JW5ffNE=W946z35=A)9GCp$(%jU%5>FRfC7_I6N@j|cS(=Ht
zk%5VYZmOx7k*=kMiLtJQsbPw)sj-=1s!?j9foZZK%p7d`9Zd{O42=y;on3(13|&nu
z3|tLdEKCec9nGE19UV<!dOh=sOA_;vQ(<;z0_}$CHNmUb%DE^tu_V7JBtJg~mI?wg
z@=NlIGx7@*oSnh3uAmW~nU|7ZUaSd<CWx<HQj0RnQd8WD@^cly;cS(O#SN*J$)?8U
zW|q21W`>EnCW$77x)w>MhQQ#kG)PP`H%hfIOICvFPa!w_^ns4j2PGDy!~+uorbrMI
zo)v%`cxFn?1LmM2U{+c0F;Aa?fyvX;#WAGf)|(mL8m^8K$79zEL{_9M6q%&4@XB3}
zMN>4m%Yx)orN!hTBW`%SJC*IeF)%DFZ2DZ4i5@xui>A1o_+9yD`Lky~&ODq~eSYS-
zwLf2N-%<Xo=JVh4=IPI77iP{96FVg)C-!I=iw2`tgU|vXWptKxnd7cdK4n$z7mRBa
zB(Fq1nt0V|(h8RMx3-%`JiM;Da>i)}X$9Bs_bpE_U-$dZ_UHf;=e$U%4=sm8W?k)h
zD?Ek$@%?uXtXUoRPrTo*aIKTc>mWC08GlG4|EK>Oau~NR_}>4mq`<Ff52NLtTBiw9
zog$eY9n_TH;eA1l_Zmy_-mvTHj?WLL&sK11YX}sIu+E$>bmq5X<9sQ{{dv1tr%X6|
zLVeN9?b|t<qFD5p>pw4fZ+l{kw}Z+Jvk1PKD-;j9S2GCx|1gtl-3jBk-7H@+pS|IG
z^84ZT$PYP_uQEkM$)8Yo-DJLQe%RN#Uul=KJ8kMuZcd)bus)$dByPf9ZkC=If3|Hp
zp#0G=eQLw8`k*@=E)~p?d_VU&t+k3^^nB1{5i7PvOSk5hO!E^4bN6i?ITJVf{n#hG
zfg!5HwlSx9Uyi*7*QP%jVpqJ98@X0I$Pdl`E3_)SKcTa1wy412)h>JAHfV4%JvtyL
zS$#btM_JuD?Ov1basOF=8S7a^8p1z)*m2}R?U@M@^BmvRrze#iiDAuak7HijU{p52
z#7el_!lEK=>4Lw<T_@`?zuA;2uVV4X=$+V;X5(3nCj~g>MJn}w4QIP@cLg{qp)soV
c*1Lg`q4UkcyS^u$v49G1Pgg&ebxsLQ01bOSI{*Lx

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xhdpi/widget_gps_info.png b/OsmAnd/res/drawable-xhdpi/ic_action_gps_info.png
similarity index 100%
rename from OsmAnd/res/drawable-xhdpi/widget_gps_info.png
rename to OsmAnd/res/drawable-xhdpi/ic_action_gps_info.png
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_speed.png b/OsmAnd/res/drawable-xhdpi/ic_action_speed.png
new file mode 100644
index 0000000000000000000000000000000000000000..aa69a709a56aea20c139ac4ff9773e9c864643ee
GIT binary patch
literal 1784
zcmbVNc~BE)6kkAy${`l9N;$Sc<3*B9$So0L0unXcBhWI+l6-+BBpZ?i0s{zWse)Rs
zRw(tVB3iMeC@_o+sMuPp9T3z31YyLc)&Ug{5Vd1B9JYTr{?Ywr_q*Qj9l!V9?2hoz
zwa&9WW<wC<EDw=Ik~3m`XF8DI7~AnL$!Q@G6iY<mY9bRg07#<369FvOqDdeUpsK92
zRuBL|b{SZ7ED@{NAX4I525OaIn6!El4M72cCOxXu00K?~NtjMdeSD#r3S%lUHHND|
z6nZI0#zL|UASydFTA8g;3RTp=Rd9ewL@Lk%0)<W5RGm>|5>qGiipaI~m`Q~vL<o(T
zI_XrbA{>_D1^{yzJh~ELabUiX!Q%4xLcSl&CihH4z+@wIL@46=ix4(E^-xJ`29;VA
zDGQ#mMefAZWP;F(n9R(~Oh%?Z12-fwSwf+ZiLjY$Hl3898?$r-YNG3mzSA0Hz^F7}
zdIH0BuvH_Ph^G@`D(UHD2wJ^D@lLVMI7Jjm8PkO7nJfmv)M~A9O-LJwNbs*4@0B)2
zXXybm5*YDxgObdL+IJdEa`$0FRzcDmQJ4WElY*woaAmp{=m@z?OeJp^DoiEfsX2T$
z!V%B`m&c|H1ss36fXh<Rx&AyBU;`B4Dp}Kd-iMd?^MyhVTPl^2Fjf#pfCM2j0SDnq
z_)@+^!kxy-bw&c!DZ#XDjI=$4UGqV#NNNBmfg7T6JaxJX!jo|VHzwnHSSp>!I=nOn
z)2Z-G<1%ZSCZm=C1C{|)!3JClPw*_l-s1xhD!KlAo{*l%W1(~o%3;w3iCh**hY&#%
z`D`HIDXCL<)&J#>Njk-}7R!H%XZnb&NbB-lE0CLa%>;C02N}p#@p$pzB-w!r<T6RL
zsb{FHP2(n+cePv=nfgZV8-2!GX0ESWG*0o`^gOYI5;4cS*n6<`vt<t|=4H2+zVeA3
zipVxo<}_sOUB2BrJ7msCLWRsstH930H9O*HZe!n}zC%^A(MuF|d3RQS{mN&St2C#U
z2Y;#8j}i?(+gu?B(csno5}uvlbpN8OVAk%Ax1T52RTYdKwY^)Ak=$kpa4nP|l$4?^
zuh)#Z6y0!r{)=BMME7m1J#{uU+9uvEUD|x>^zd%`J+|Ou8)x$jnxx=x^1fd?YUMw4
z>aofVP3Il-u6`>8@k`L$Ro=lqedivvTiD|_KU#fF^2Wskb$sf8e%sTPHj`T6o4>Cm
z%4b&DrJ<dI#$AzJ5N%s<V1do9dvu3WTAiE3PT<0eQ{HmfQBR2gtN8Mg$I$$3IpQA4
z$o%7%OHGgX`Thw9xoocjQwe6dbJK7;3_5rDs6sOzQ<r9CcSdI1+nT+Rn}5Pw*Kj;8
zC(txVbLs^iDJOpS&o4w;)SP0UI&q)-!T2L{)kC(`ONJ?onx`7`S*$zPtI__?)$YAe
zv)4o2e*D6&)2Yc%tKx6K0rr+l>-X3w5SKhtZ_G$LO_y90JFW~F`8#1&d`%rZz<XJx
zXO87cfVAb{weEb)ca;MxyJA{tjMpwr_eVXi1iYolkA!({EL)NH&9(dGZImsy<TKZn
z(AzaD%A3b>GRj5iUKfV9x}6W)Sj*|E{d%mFm*&ck8{dA?>3L_RsWnr&*fAIU@yzB*
zQ+T5V^o|v+gEUnEo)<^vE$wvc|Gq!Urf1=3JI%rTkoD8)((ag&fdvsx$nHh`XO?4}
zw%|NB&tm=Jl(f>EJM`+B123VJx*DPJ?kh@V5x=z_a62sBUtAw-3d$H>6}H){ZWDUl
zuXycVm+Hp{^bdJ%=vdiYnz=Kt{=nj6d*f%^GhR*^D2vLiAAE6j;FEIqYFT?OV?Xn^
z4bEQ`9uD1XuYKa!TVi%}Z%r!a2yQEu=BN)HKldhPZql)|SC%L3XZNjxMwXlu<WG*b
d{QN*$Cn(n={S?jeWT*9CBo7Le{kSHf@E`kNsVo2h

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_time.png b/OsmAnd/res/drawable-xhdpi/ic_action_time.png
new file mode 100644
index 0000000000000000000000000000000000000000..fb2fb4886912a0990a98d475030b6ad9144e84e3
GIT binary patch
literal 1801
zcmbVNX;2eq7>)>X42;r%3TV5;h8oLeb8Zfam=Y9(1PHWXRb-QFAVRV+Ss)<oa9A%y
zQB*FkI*QafKsBNQ6;lC+VuwR(L0ds_L<I$_M9`M$2Eq1+<B#sl?)Sal_dd^i&u)*D
zt#otob|H~SZlNI(Ik7TquhT5z8*4Ydl~}y+;5a-QQ{(A~0VRo5m;wbtwMZf=M-f%V
z##S_dM4FkViHXDGq~Ss(rllh`9lA-YC(tBPK%hyFD3ehfP@st#orp4A-$(&8DiI}?
zD`iOaL1>aDB-4OKXUbxfnaN6liW0aC2rvl=0xgOofJvL8GYU;2$|SFl*xQaF3NWdH
zCyOX=oQji10zsGo1-Nt=R5F+xfG40cxiC+_^9NXj3^Di+ivcnOLM~g#U;$GPg|KE&
zsfBXMiYZ%!B%&nYxLycB>FMe8bT%C`BtlGqKmajV5Q_y88lW*lha)CXXIwPRAVG~v
zgGP^QFdblHL=;#mE}{^gz6n9AmrCCf>x@&0B2osK5Iw}CGa#+j7T2V<5tpO?y75kJ
zV@!q~h2*FaOEoBodZ-sogNfX|-;hm_@J1M6&=5sIQY4r%Rg3EIP>F~_+|X4Tl@L~Q
zcq|5o529R{1q%2aHpu5PRUnrQGf@_bFt|$QG|#*6Vm418;IKGB5(35y=I|N83<;mZ
z;EH)cJh7NNjSbZqaYUy?r)_Hp+f!Kfd$GbG1B&37AqK-zrn?|A3BxgC5~c@&f+njD
zERNOaR9L!^W-HU1s3oXDlZL8R7%(j`nP;Kq9X_A}C6~>E1)u_EA|MChFhRb8%Ouhv
zU?2(}3+2N~$`oGpfAa?sPC>S2`A_pq9}yjC+rAwILU=n&sE(K*12HNQg4PUT0%@TV
zag6EKP-%NIS?qE3c9$e&gQtR~m~%odYR=xDsr3}USX?`L>sWk)Q$e42#N*jL@v5#s
zalrnYxsIc=YaD0}=YDX~HsyJ8ys4kBZJY_!1gO)~($qY+`<4Ml%AM+-(xC?4p<VsB
z`3#<FzF;ON)#7UoZeu5SxaRrl=O2HV;g)4LnBdi5S8WMYwkya!g)<y#9zAUHd!!Cm
zIDKC->+I2|C1HnBPV}$pTQYX9dmdt3%R4M97|!m7c3Y&o2LdhZFMF}eD@P6;e&Tp_
z`7UcKwPO%DX|Ky^gkLV79XC>PkySE_R!|zYN7i%Yf!(<I%;q{vLsKiJcl_85{<h<n
zB9Q+4{%wBF-lj3fLiS&d#-isYAL@1c7V3)F%h}C+KCXpYdJ#en37gP1`H!xgla=>%
zYx&sYf$QyYd%Rvb$b#o*<@t}hnD;g8TrgwlwUBuB9J;VBqoO{D=^#4_^q9BLCx?U_
zkozXttxL$KMQn|8@pE>nD4CesToInInf3)YP+t2%$R6zc&XL~M$2m+m{#d{Mcln}T
zotK-u<Dj~Kp7eC=h2gt^^TCAvU;X@QPHmHxUG|0VBq{8Cc61+i9#ZyiAd@SXDDux$
zHac3HI`@xRTE04v^@n3}U+xy!5elraJJMt7xVL$sW4k4~(0SywI5?%t{?6Hru&Tyc
zzXnb&{Im}&i8801vGJX*d3LeTd0Uy)o$q`&<Zyo3nD3A7(A`VLc{iF8!G%=*fMsc`
zdw*TT!m5B(_M&Uj)xyDi@3E@EhQ<fcFSjha)+3a?-negvH9u;>Ngwb^9U@l#wDb6;
z;!cp3NTs51#ojY5S@W*U9lc$Dw6fPaSboY?Hk4cY^SQ;|YtXhf+F)mQ+1bw0uvg}}
z&)v_@E!uU$S~phdPb;ezdFKpM52em7&lf*=Wd4nOBfjzO_4xIwC!^SlAyRVndaI_o
zJ!;e65izmhWcPS|cuQ(CUN}*%UB~onRi~t@o<i1{k<RX>Z}0;8IBs2Dn0%ADq0KeQ
z(lvPNBhNau=he~T+N#xBYR9GTuunQp{kcAS2Farvo+vK<FyHob3JsP?sy<7|{Rf?}
By`umC

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_time_to_distance.png b/OsmAnd/res/drawable-xhdpi/ic_action_time_to_distance.png
new file mode 100644
index 0000000000000000000000000000000000000000..e829179a1d226b6b9a6b9a79b70bd2211f1f1155
GIT binary patch
literal 1944
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
ACIA2c

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xhdpi/ic_widget_gpx.png b/OsmAnd/res/drawable-xhdpi/ic_widget_gpx.png
deleted file mode 100644
index b488bf0bae3ff2748b6f50ed62375671645f37e1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1531
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%w?G&5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;TrkiYFXrf?lsb^?v
zW^QS&qhJK&>l;|;8yV;tSX!AHTNxNBK!Fm_wxX0Ys~{IQs9ivwtx`rwNr9EVetCJh
zUb(Seeo?x<p{1pzzJZaxk&!M?g>G?WUP)qwZeFo6%mkOz;^d;tf|AVqJOz-6iAnjT
zCALaHmqNUdTj1*pH#n~t8c@I>)2~P@&^OdG(9g{U`3tPNxFjeQ;S8**i$f|4QuTvU
zi}Op1l7aD&rVP^z3_JW5ffNE=W946z35=A)9GCp$(%jU%5>FRfC7_I6N@j|cS(=Ht
zk%5VYZmOx7k*=kMiLtJQsbPw)sj-=1s!?j9foZZK%p7d`9gU3~9gQ5#on3(13|&nu
z3|tLdEKCecfkNhvj;1iZo_WP3iFwJXFuOB>c0=`=;ni#9T$Gwvl3x^(pPvIu1pyiP
zCHch}`2`Bj&fr*A&<M}WOUW-U)&xZp#MdsVMVV!(DQ-pixeDNLw#vlfhE&UBQ)6>8
zOWh<h!$e(^L=!_@izHJ+U~pI(Bqo^~rCOLJD?#<AkQ;vbKu76=5(`q|fe8UqB!~&m
z3P27#Go|JMb5Id5t7L@R*D)|KNqf3DhE&{oGxMw$v!TH8-Evy2tE&SX`{knVI|=UJ
zaC%=e{{!cat^|FtkQxqA7XGY{tHL)va{RJt`>igo(!cC(9EH2@n#?v^`tvaVC&Ost
zoU}=@a}_v(_O59R=|63iAiII@%SL9)4a`~(ns+ST7<1ev;dz5f<_7M4&CimGs}(LE
zd++_wLoOw=fGaKeR(yl&htyMIT3$NyGTXLI5scR0mpT+y$zUg;RwMQJ>VovGIf{~x
z7j4*3{h;l}PLt!SGn$x169em7*6QB~^Wk{p&-KW@w;@aTw&I6lUn2$h%d9&tJMEWB
zjL!bJMuR`5u{>b;w&^7T-Cn2atRLCj^fF>Av3S6`HniiH_1%5kYYX2h8*m<5A)EHu
z-^fu%%8K*GX50A-zgbi)H7kD9daKln>zmms=j$=Q8GIT73r_UjpE0ME%dn|JwNv3+
zQs2o}5;<;X@*9M&nqSD9H?1;xUe2$cYQ7auGGp22Ul9vBcX`*<S26)7FI%1K{b$X7
z<#WmO)k0d8w>lKU&R=f3(i&l<+bk8>H*vZ3CpMYh{|^FwvZThB+{{Z~=)O=s)PI)n
zuk&hm+|IZBvnp_Y6Eo{^>AKBkQqx~faJpeTHD*(be2{b2h0UGUTW>8CIk9@l<{jGF
zH<Lc7MoiFTd%e$VL#s}s(2vdy$;H1DBDYOi`<wT}spe1v{$&{p{Y5ss$tqg?*euKb
m)mr9jjISF?6@vCN@i4rt3pvD<XSW+v9DBO@xvX<aXaWG+NG>G+

diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_altitude.png b/OsmAnd/res/drawable-xxhdpi/ic_action_altitude.png
new file mode 100644
index 0000000000000000000000000000000000000000..661605292bf32ea373fa8de702a1f69a36e325f5
GIT binary patch
literal 1947
zcmbVNe^3*57LT<}sR#CyoCQwpHnbw@vb*`orbK2*z@(Qz2!Z6#>#^A^WC_W}?Ajz$
zipbd;?O|1@jnL6lM6nk1YOJ1=p;W9MHON6NR?oq~p2e}0_WXgC!*+w9{loE(+nL?>
zec$i<y!XEEz0d4ML-vZ8SqZavJYI}eqc(C<6M3Wf+&6#Z@Cr`EvzZn)k1l4txQFCn
zHrh%8S|?sY8cE#dU;R%qjmMk$8fCJu7QIeE(9RS*Vw2)?x;ZqDmzM5x<Aj4`0V`QT
zxs<}uwhkdc*_1-FR1fRjD$-7A$~|OWdA5ltcMzyen7$lH^C>t7PLjm|pR>%xD11uc
zq+bQMj%-6hVA6zjD24Zvvgi$fiuRCzG(`pyFd_luXbK{g$x-<-K*Z?~oC=9x5JnYJ
zu>uwWQ;(2~=CKtkjOwhZSe&L5+F91EfFQ5eo8lFx(4G<qK~WTfMUY4Yauy)tcd@t+
zbTNt39@Hd5cqlhZ(Jmn35x3H7Sf!B5^!^o`ZoU42V;3`3D6V9X4|hXI3Jf`&k$X*A
zGpvz(n8qWm8I#{lLPnCI*LVo7AH|8&V6JwL4-_%vvQgxCD6T1ZnVKfnI7t_)RV#(u
zNs5iKDP+YGxd@h|f}~U?0?|~77)+HSHc%>-A*6`JVJU%3`*{=|m1d~aGE}Wnb1)=R
zl94G<t6{lZgo#lYk&33VS{K9OE`pqnO>wcOu&T#m6)F#jv$V%V(`D0BV6f9H&Dd!-
zpi)hC9awCpTsGRvBuCnG|JG{KL%l}YvOKgCn5?scdPEK+N=U_W846lu2o6ec2?C~C
zr3hCJ6vnM`5t%9@gj0Ci|64zZOA3k%%dduKdW)OL$npUdIOPGENEgQ-4@Z@QySkp`
z7}%y&V<z8)?;7+PQ?B6D3bH$c*@^}FGFDm^HP6Y2uM&VyIL!dKX<qKue+idfSnS#@
z{5&%*s$$tD0I}DCOBU}pX#Tc-InX=Tv)=IE#=e1{`{L_g9o^{{kG5Y6e{$omgP-}o
z4Y!Y-RgPU^1_MM~mS&H+)dKK0V%9BjFHVWM)m;FhiH?Y~q1gF4ZzCG-S!kNU&#&w(
z{2{lv_j&NCqu3k^|M-h1?-j_KH;=#moPC>Myd@E^{&+X8>4IrXN$(<eHq#<t`F?)O
zld9lfHtu-3p|d|24#LOY`E-6$TH&tGF!As*`=R&)^G2^=ul)Ve<*aREXV%@iT=DVQ
z;F8`Gt15$c*FJNsZX|iHtg1bf9P0a1Z`AjWR(dA5^QNvT@I@IftnE4==^%!0%@gF7
zp@FZu^y{ogPhI&K^%q5*sahZ#MZ<v`F{Xy0i-9`_-jELmDEG?PF8b;89W#zv{vFFd
zQGe&D-eGff_osFHPt*oqjqRxK%h(syzx}5k|Du;}OxO*(_MZ4NR+C&1Q?v#77O~U?
z+oPDueS^`ZGG7J%`q0qpf%B^k*2ZuK{K4JLqrq;7zj{H<K$2m`Y#1pmiqVEHb*&xX
zoxW9#Jr^^c(3tdIc1v<-@QbyBFYLR*6qbHjRbon2oYNml+Av;FWo9qfzuMEESeW!O
zMRt=lC?7XNo%aOe@AE5PVZwLkv{YXk=+=!mE;olmc{%@(&d$SHq&WdueP28Ok0XBT
zruDxQctus{Z?xNAnx7v!y^^Y1xQG%rza4*bd0yEH#qFi)r2Yc)@#vw2Ezj=1BN=2m
zg|`=;bGZ`ga$csEhQ)2=1JO&0Zl@g%Zrgvp?TR(sm+OzMsXJbfu(z;BTzyQL(^j*=
zlz&ki>`7#-tMH$`zWNS!ME9SG&x@;?jiqm$y1ICKo}Xx<6lTx4;CVEsaC6+M-5Yjf
zPPl&GHA1zH_r4c5q3akso?qI0G;k2BI(Y;N&eh$yIZ}qky<c5%c=wlM&Hcv4KM<Sy
zo_W3@cDETDsdt>b{7JvD`r?hWzVH11d$at*4$Yd0Z;T(V``{bVTMj1prV)w_&55?p
zy6(L>v|9GH;CgSMF%&o>7CrgBCTpU6MEB9bosLfC-5$RPOCK(CboE3J_4q%^#}k;=
z1=X`_8?d~J(?jOaRl(AxBTcYCH^HbKJF%_22EwmyNbab;M{ldl{Ov<hM7Z&gFox~d
c-sR2Yozc%cbZJj*<TuRIW@f8fGm6&#0wF5?6#xJL

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xxhdpi/widget_gps_info.png b/OsmAnd/res/drawable-xxhdpi/ic_action_gps_info.png
similarity index 100%
rename from OsmAnd/res/drawable-xxhdpi/widget_gps_info.png
rename to OsmAnd/res/drawable-xxhdpi/ic_action_gps_info.png
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_speed.png b/OsmAnd/res/drawable-xxhdpi/ic_action_speed.png
new file mode 100644
index 0000000000000000000000000000000000000000..8231d72e6408de63a420b5fd47f03423c54a735c
GIT binary patch
literal 2276
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
V6D3v^Ur+vbczO5<PPs=U{|yMEml6N~

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_time.png b/OsmAnd/res/drawable-xxhdpi/ic_action_time.png
new file mode 100644
index 0000000000000000000000000000000000000000..46925feaf47d68177feb13117c8b9cc3ddba0f89
GIT binary patch
literal 2388
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

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_time_to_distance.png b/OsmAnd/res/drawable-xxhdpi/ic_action_time_to_distance.png
new file mode 100644
index 0000000000000000000000000000000000000000..d2985f11e17987801132491654b590be65697e62
GIT binary patch
literal 2394
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

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xxhdpi/ic_widget_gpx.png b/OsmAnd/res/drawable-xxhdpi/ic_widget_gpx.png
deleted file mode 100644
index 953f4898b2edc2d2fd2ef0318284ea85dfd75377..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1890
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

diff --git a/OsmAnd/res/layout/drawer_list_item.xml b/OsmAnd/res/layout/drawer_list_item.xml
index bda3867a34..e3992f85c0 100644
--- a/OsmAnd/res/layout/drawer_list_item.xml
+++ b/OsmAnd/res/layout/drawer_list_item.xml
@@ -15,7 +15,7 @@
         android:layout_marginBottom="8dp"
         android:layout_marginTop="8dp"
         android:layout_gravity="center_vertical"
-        tools:src="@drawable/ic_action_info_dark" />
+        tools:src="@drawable/ic_action_gabout_dark" />
 
     <TextView
         android:id="@+id/title"
diff --git a/OsmAnd/res/layout/osmo_create_group.xml b/OsmAnd/res/layout/osmo_create_group.xml
index b8f012f70a..cb2914b94a 100644
--- a/OsmAnd/res/layout/osmo_create_group.xml
+++ b/OsmAnd/res/layout/osmo_create_group.xml
@@ -87,7 +87,7 @@
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:background="?attr/options_button_background"
-				android:src="@drawable/ic_action_info_dark"/>
+				android:src="@drawable/ic_action_gabout_dark"/>
 		</LinearLayout>
 
 		<TextView
diff --git a/OsmAnd/src/net/osmand/plus/helpers/GpxUiHelper.java b/OsmAnd/src/net/osmand/plus/helpers/GpxUiHelper.java
index d2bf4e708a..a9cff91bb3 100644
--- a/OsmAnd/src/net/osmand/plus/helpers/GpxUiHelper.java
+++ b/OsmAnd/src/net/osmand/plus/helpers/GpxUiHelper.java
@@ -185,7 +185,7 @@ public class GpxUiHelper {
 			s = s.replace('_', ' ');
 
 			adapter.item(s).selected(multipleChoice ? 0 : -1)
-					.iconColor(R.drawable.ic_action_info_dark).reg();
+					.iconColor(R.drawable.ic_action_polygom_dark).reg();
 
 			//if there's some selected files - need to mark them as selected
 			if (selectedGpxList != null) {
diff --git a/OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java b/OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java
index 358551665e..f99cd6b643 100644
--- a/OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java
+++ b/OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java
@@ -472,7 +472,7 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
 					menuItem.setTitleCondensed(getString(R.string.osmo_follow));
 				}
 				if (group != null) {
-					createMenuItem(menu, GROUP_INFO, R.string.osmo_group_info, R.drawable.ic_action_info_dark,
+					createMenuItem(menu, GROUP_INFO, R.string.osmo_group_info, R.drawable.ic_action_gabout_dark,
 							MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
 				}
 				if ((group != null && !group.isMainGroup()) || (device != null && device.getGroup().isMainGroup())) {
@@ -888,7 +888,7 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
 			}
 		};
 		ImageButton info = (ImageButton) v.findViewById(R.id.info);
-		info.setImageDrawable(app.getIconsCache().getContentIcon(R.drawable.ic_action_info_dark));
+		info.setImageDrawable(app.getIconsCache().getContentIcon(R.drawable.ic_action_gabout_dark));
 		info.setOnClickListener(click);
 		warnCreateDesc.setOnClickListener(click);
 		
diff --git a/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyCustomization.java b/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyCustomization.java
index 95d0205b78..52498b9b83 100644
--- a/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyCustomization.java
+++ b/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyCustomization.java
@@ -487,7 +487,7 @@ public class SherpafyCustomization extends OsmAndAppCustomization {
 		if(layers.getContextMenuLayer().getFirstSelectedObject() instanceof StageFavorite) {
 			final StageFavorite sf = ((StageFavorite)layers.getContextMenuLayer().getFirstSelectedObject());
 			if(selectedStage != null) {
-				adapter.item(R.string.show_waypoint_information).iconColor(R.drawable.ic_action_info_dark).position(0)
+				adapter.item(R.string.show_waypoint_information).iconColor(R.drawable.ic_action_gabout_dark).position(0)
 				.listen(new OnContextMenuClick() {
 					@Override
 					public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) {
@@ -561,7 +561,7 @@ public class SherpafyCustomization extends OsmAndAppCustomization {
 					}).reg();
 		}
 		//important info
-		adapter.item(R.string.sherpafy_tour_info_txt).iconColor(R.drawable.ic_action_info_dark)
+		adapter.item(R.string.sherpafy_tour_info_txt).iconColor(R.drawable.ic_action_gabout_dark)
 				.listen(new OnContextMenuClick() {
 					@Override
 					public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) {
diff --git a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
index 38004852af..22a301f700 100644
--- a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
@@ -453,7 +453,7 @@ public class MapControlsLayer extends OsmandMapLayer {
 //				&& (!routeFollowingMode || settings.SHOW_ZOOM_BUTTONS_NAVIGATION.get());
 		boolean showButtons = routePlanningMode || !routeFollowingMode || (System.currentTimeMillis() - touchEvent < TIMEOUT_TO_SHOW_BUTTONS);  
 		updateMyLocation(rh);
-		routePlanningBtn.setIconResId(routeFollowingMode ?	R.drawable.ic_action_info_dark : R.drawable.ic_action_gdirections_dark	);
+		routePlanningBtn.setIconResId(routeFollowingMode ?	R.drawable.ic_action_gabout_dark : R.drawable.ic_action_gdirections_dark	);
 		routePlanningBtn.updateVisibility(showButtons && !routePlanningMode);
 
 		menuControl.setIconResId(settings.USE_DASHBOARD_INSTEAD_OF_DRAWER.get() ? R.drawable.ic_dashboard_dark

From 02e26282601c059464c559b7bed8bf02ac3bfdf4 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Wed, 1 Apr 2015 22:38:23 +0200
Subject: [PATCH 4/4] Fix arrow rotation

---
 .../osmand/plus/views/DirectionDrawable.java  | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/views/DirectionDrawable.java b/OsmAnd/src/net/osmand/plus/views/DirectionDrawable.java
index 69d84584eb..f541ac956b 100644
--- a/OsmAnd/src/net/osmand/plus/views/DirectionDrawable.java
+++ b/OsmAnd/src/net/osmand/plus/views/DirectionDrawable.java
@@ -33,12 +33,14 @@ public class DirectionDrawable extends Drawable {
 		IconsCache iconsCache = ((OsmandApplication) ctx.getApplicationContext()).getIconsCache();
 		arrowImage = iconsCache.getIcon(resourceId, clrId);
 		this.resourceId = resourceId;
+		onBoundsChange(getBounds());
 	}
 
 	public void setImage(int resourceId) {
 		IconsCache iconsCache = ((OsmandApplication) ctx.getApplicationContext()).getIconsCache();
 		arrowImage = iconsCache.getIcon(resourceId, 0);
 		this.resourceId = resourceId;
+		onBoundsChange(getBounds());
 	}
 	
 	public DirectionDrawable(Context ctx, float width, float height) {
@@ -90,18 +92,26 @@ public class DirectionDrawable extends Drawable {
 		}
 		return super.getIntrinsicHeight();
 	}
+	
+	@Override
+	protected void onBoundsChange(Rect bounds) {
+		super.onBoundsChange(bounds);
+		if (arrowImage != null) {
+			Rect r = getBounds();
+			int w = arrowImage.getIntrinsicWidth();
+			int h = arrowImage.getIntrinsicHeight();
+			int dx = r.width() - w;
+			int dy = r.height() - h;
+			arrowImage.setBounds(r.left + dx / 2, r.top + dy / 2, r.right - dx / 2, r.bottom - dy / 2);
+		}
+	}
 
 	@Override
 	public void draw(Canvas canvas) {
 		canvas.save();
 		if (arrowImage != null) {
-			int w = arrowImage.getIntrinsicWidth();
-			int h = arrowImage.getIntrinsicHeight();
-			int dx = canvas.getWidth() - w;
-			int dy = canvas.getHeight() - h;
-			arrowImage.setBounds(0, 0, w, h);
-			canvas.rotate(angle, w / 2, h / 2);
-			canvas.translate(dx / 3, dy / 3);
+			Rect r = getBounds();
+			canvas.rotate(angle, r.centerX(), r.centerY());
 			arrowImage.draw(canvas);
 		} else {
 			canvas.rotate(angle, canvas.getWidth() / 2, canvas.getHeight() / 2);