From 284f53ba1900948a1a7f141317f68d669befaa01 Mon Sep 17 00:00:00 2001
From: Alex Sytnyk <asytnyk0@gmail.com>
Date: Thu, 24 May 2018 19:23:23 +0300
Subject: [PATCH] Fix #4149

---
 OsmAnd/res/layout-land/map_hud_bottom.xml | 11 +++++++++++
 OsmAnd/res/layout-land/map_hud_top.xml    | 10 ----------
 OsmAnd/res/layout/map_hud_bottom.xml      | 13 ++++++++++++-
 OsmAnd/res/layout/map_hud_top.xml         | 10 ----------
 4 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/OsmAnd/res/layout-land/map_hud_bottom.xml b/OsmAnd/res/layout-land/map_hud_bottom.xml
index 4aa13cd681..31ebf31aaa 100644
--- a/OsmAnd/res/layout-land/map_hud_bottom.xml
+++ b/OsmAnd/res/layout-land/map_hud_bottom.xml
@@ -242,6 +242,17 @@
 
     </LinearLayout>
 
+    <ProgressBar
+        android:id="@+id/map_horizontal_progress"
+        style="?android:attr/progressBarStyleHorizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:max="100"
+        android:minHeight="0dp"
+        android:visibility="gone"
+        tools:progress="60"
+        tools:visibility="visible" />
+
     <include
         layout="@layout/move_marker_bottom_sheet"
         android:layout_width="match_parent"
diff --git a/OsmAnd/res/layout-land/map_hud_top.xml b/OsmAnd/res/layout-land/map_hud_top.xml
index dcb81661ae..7ffd423c86 100644
--- a/OsmAnd/res/layout-land/map_hud_top.xml
+++ b/OsmAnd/res/layout-land/map_hud_top.xml
@@ -603,16 +603,6 @@
 
                 </FrameLayout>
 
-                <ProgressBar
-                    android:id="@+id/map_horizontal_progress"
-                    style="?android:attr/progressBarStyleHorizontal"
-                    android:layout_width="@dimen/map_routing_progress_width"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="@dimen/map_button_margin"
-                    android:layout_marginRight="@dimen/map_button_margin"
-                    android:max="100"
-                    android:progress="60"
-                    android:visibility="gone"/>
             </LinearLayout>
         </FrameLayout>
     </LinearLayout>
diff --git a/OsmAnd/res/layout/map_hud_bottom.xml b/OsmAnd/res/layout/map_hud_bottom.xml
index d4bc327e9b..a401a300b4 100644
--- a/OsmAnd/res/layout/map_hud_bottom.xml
+++ b/OsmAnd/res/layout/map_hud_bottom.xml
@@ -233,7 +233,18 @@
         </LinearLayout>
     </FrameLayout>
 
-        <FrameLayout
+	<ProgressBar
+		android:id="@+id/map_horizontal_progress"
+		style="?android:attr/progressBarStyleHorizontal"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:max="100"
+		android:minHeight="0dp"
+		android:visibility="gone"
+		tools:progress="60"
+		tools:visibility="visible" />
+
+	<FrameLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
diff --git a/OsmAnd/res/layout/map_hud_top.xml b/OsmAnd/res/layout/map_hud_top.xml
index 27ce58301f..654bb611ec 100644
--- a/OsmAnd/res/layout/map_hud_top.xml
+++ b/OsmAnd/res/layout/map_hud_top.xml
@@ -647,16 +647,6 @@
 
             </FrameLayout>
 
-            <ProgressBar
-                android:id="@+id/map_horizontal_progress"
-                style="?android:attr/progressBarStyleHorizontal"
-                android:layout_width="@dimen/map_routing_progress_width"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/map_button_margin"
-                android:layout_marginRight="@dimen/map_button_margin"
-                android:max="100"
-                android:progress="60"
-                android:visibility="gone"/>
         </LinearLayout>
     </FrameLayout>