From 4f85eb58729fb75f34eb7024880749ad9279719b Mon Sep 17 00:00:00 2001
From: Daniel Sandler <dsandler@android.com>
Date: Tue, 1 May 2012 13:50:29 -0400
Subject: [PATCH] Move legacy menu key to bottom right on sw600dp.

It's too easy to press if it's *all* the way to the right,
though, so there a 2dp margin separating it from the bezel.

Bug: 6399312
Change-Id: If4ebcd4cfcee0c667bcc6142af86c04445f41fea
---
 .../res/layout-sw600dp/navigation_bar.xml     | 44 ++++++++++---------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/packages/SystemUI/res/layout-sw600dp/navigation_bar.xml b/packages/SystemUI/res/layout-sw600dp/navigation_bar.xml
index 662c18681a875..67e13eb7af960 100644
--- a/packages/SystemUI/res/layout-sw600dp/navigation_bar.xml
+++ b/packages/SystemUI/res/layout-sw600dp/navigation_bar.xml
@@ -41,17 +41,18 @@
             >
 
             <!-- navigation controls -->
-            <Space 
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                />
             <View
                 android:layout_width="48dp"
                 android:layout_height="match_parent"
                 android:layout_weight="0"
+                android:layout_marginLeft="2dp"
                 android:visibility="invisible"
                 />
+            <Space 
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                />
             <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/back"
                 android:layout_width="128dp" android:paddingLeft="25dp" android:paddingRight="25dp"
                 android:layout_height="match_parent"
@@ -79,21 +80,22 @@
                 systemui:glowBackground="@drawable/ic_sysbar_highlight"
                 android:contentDescription="@string/accessibility_recent"
                 />
+            <Space 
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                />
             <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/menu"
                 android:layout_width="48dp"
                 android:layout_height="match_parent"
                 android:src="@drawable/ic_sysbar_menu"
+                android:layout_marginRight="2dp"
                 systemui:keyCode="82"
                 android:layout_weight="0"
                 android:visibility="invisible"
                 android:contentDescription="@string/accessibility_menu"
                 systemui:glowBackground="@drawable/ic_sysbar_highlight"
                 />
-            <Space 
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                />
         </LinearLayout>
 
         <!-- lights out layout to match exactly -->
@@ -165,17 +167,18 @@
             >
 
             <!-- navigation controls -->
-            <Space 
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                />
             <View
                 android:layout_width="48dp"
                 android:layout_height="match_parent"
                 android:layout_weight="0"
+                android:layout_marginLeft="2dp"
                 android:visibility="invisible"
                 />
+            <Space 
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                />
             <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/back"
                 android:layout_width="162dp" android:paddingLeft="42dp" android:paddingRight="42dp"
                 android:layout_height="match_parent"
@@ -203,9 +206,15 @@
                 systemui:glowBackground="@drawable/ic_sysbar_highlight"
                 android:contentDescription="@string/accessibility_recent"
                 />
+            <Space 
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                />
             <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/menu"
                 android:layout_width="48dp"
                 android:layout_height="match_parent"
+                android:layout_marginRight="2dp"
                 android:src="@drawable/ic_sysbar_menu"
                 systemui:keyCode="82"
                 android:layout_weight="0"
@@ -213,11 +222,6 @@
                 android:contentDescription="@string/accessibility_menu"
                 systemui:glowBackground="@drawable/ic_sysbar_highlight"
                 />
-            <Space 
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                />
         </LinearLayout>
 
         <!-- lights out layout to match exactly -->