From 93ac2be6ec9779d52966c5ca65c9a5868923a393 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Sun, 15 Mar 2015 23:56:27 +0100
Subject: [PATCH] Landscape

---
 OsmAnd/res/layout-land/map_hud_bottom.xml | 61 +++++++++++------------
 1 file changed, 30 insertions(+), 31 deletions(-)

diff --git a/OsmAnd/res/layout-land/map_hud_bottom.xml b/OsmAnd/res/layout-land/map_hud_bottom.xml
index 4326374e44..47baa1073e 100644
--- a/OsmAnd/res/layout-land/map_hud_bottom.xml
+++ b/OsmAnd/res/layout-land/map_hud_bottom.xml
@@ -7,8 +7,9 @@
 
     <FrameLayout
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content" >
-
+        android:layout_height="wrap_content" 
+        android:layout_gravity="bottom|left"
+        >
         <!-- ALARM -->
 
         <FrameLayout
@@ -69,8 +70,8 @@
             android:layout_height="wrap_content"
             android:layout_gravity="bottom|left"
             android:layout_marginBottom="@dimen/map_button_margin"
-            android:layout_marginRight="@dimen/map_button_spacing_land"
             android:layout_marginLeft="@dimen/map_button_margin"
+            android:layout_marginRight="@dimen/map_button_spacing_land"
             android:orientation="horizontal" >
 
             <ImageButton
@@ -84,40 +85,12 @@
                 android:id="@+id/map_route_info_button"
                 android:layout_width="@dimen/map_button_size"
                 android:layout_height="@dimen/map_button_size"
-                android:layout_gravity="bottom"
                 android:layout_marginLeft="@dimen/map_button_spacing_land"
                 android:background="@drawable/btn_round"
                 android:src="@drawable/ic_action_remove_light" />
         </LinearLayout>
     </FrameLayout>
 
-    <!-- RULER -->
-
-    <FrameLayout
-        android:id="@+id/map_ruler_layout"
-        android:layout_width="@dimen/map_ruler_width"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom"
-        android:visibility="gone" >
-
-        <TextView
-            android:id="@+id/map_ruler_text"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:layout_gravity="bottom"
-            android:layout_marginBottom="@dimen/map_ruler_bottom_margin"
-            android:gravity="center_horizontal"
-            android:text="100 m"
-            android:textSize="@dimen/map_widget_text_size_small" />
-
-        <ImageView
-            android:id="@+id/map_ruler_image"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom"
-            android:background="@drawable/ruler" />
-    </FrameLayout>
-
     <FrameLayout
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -125,6 +98,32 @@
         android:layout_marginBottom="@dimen/map_button_margin"
         android:layout_weight="1" >
 
+        <!-- RULER -->
+
+        <FrameLayout
+            android:id="@+id/map_ruler_layout"
+            android:layout_width="@dimen/map_ruler_width"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom" >
+
+            <TextView
+                android:id="@+id/map_ruler_text"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:layout_gravity="bottom"
+                android:layout_marginBottom="@dimen/map_ruler_bottom_margin"
+                android:gravity="center_horizontal"
+                android:text="100 m"
+                android:textSize="@dimen/map_widget_text_size_small" />
+
+            <ImageView
+                android:id="@+id/map_ruler_image"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom"
+                android:background="@drawable/ruler" />
+        </FrameLayout>
+
         <!-- TRANSPARENCY -->
 
         <LinearLayout