Make the vertical navbar 48dp like the horizontal one.

When the navigation bar was originally introduced to phones
(in change Ic613a335) we wanted it to stick to the same spot
on the display so that it felt as much as possible like a
physical button array; pressing the same fingertip-sized
spot on the glass should always invoke BACK, etc. This meant
flipping the nav bar to a vertical orientation when the
phone was in landscape, and then juggling around the window
insets and other system windows to make room for it.

For reasons that are now lost to time, in that original
implementation we made the vertical navigation bar narrower:
42dp (versus 48dp for the horizontal navigation bar, which
incidentally is always horizontal on tablet-type devices).
Nobody really noticed (except app developers looking to
hardcode this value instead of just using fitSystemWindows
or the new WindowInsets).

Here we finally make the navigation bars match perfectly in
portrait and landscape.

Bug: 23724209
Change-Id: I861be84b41c6a227d269469686c8c66a32029f1d

diff --git a/core/res/res/values/dimens.xml b/core/res/res/values/dimens.xml
index 09c1e6f..8635a4f 100644 (file)
--- a/core/res/res/values/dimens.xml
+++ b/core/res/res/values/dimens.xml
@@ -37,7 +37,7 @@
     <!-- Height of the bottom navigation bar in portrait; often the same as @dimen/navigation_bar_height -->
     <dimen name="navigation_bar_height_landscape">48dp</dimen>
     <!-- Width of the navigation bar when it is placed vertically on the screen -->
-    <dimen name="navigation_bar_width">42dp</dimen>
+    <dimen name="navigation_bar_width">48dp</dimen>
     <!-- Height of notification icons in the status bar -->
     <dimen name="status_bar_icon_size">24dip</dimen>
     <!-- Size of the giant number (unread count) in the notifications -->

diff --git a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_back_ime_land.png b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_back_ime_land.png
deleted file mode 100644 (file)
index 165ef4f..0000000
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_back_ime_land.png and /dev/null differ

diff --git a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_back_land.png b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_back_land.png
deleted file mode 100644 (file)
index f95f09f..0000000
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_back_land.png and /dev/null differ

diff --git a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_home_land.png b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_home_land.png
deleted file mode 100644 (file)
index 860a906..0000000
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_home_land.png and /dev/null differ

diff --git a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_menu_land.png b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_menu_land.png
deleted file mode 100644 (file)
index bcb203e..0000000
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_menu_land.png and /dev/null differ

diff --git a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_recent_land.png b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_recent_land.png
deleted file mode 100644 (file)
index bab268e..0000000
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_recent_land.png and /dev/null differ

diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_sysbar_back_land.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_sysbar_back_land.png
deleted file mode 100644 (file)
index 2f4dbbe..0000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_sysbar_back_land.png and /dev/null differ

diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_sysbar_back_land.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_sysbar_back_land.png
deleted file mode 100644 (file)
index d04d84f..0000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_sysbar_back_land.png and /dev/null differ

diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_sysbar_back_land.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_sysbar_back_land.png
deleted file mode 100644 (file)
index 1500ae5..0000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_sysbar_back_land.png and /dev/null differ

diff --git a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_sysbar_back_land.png b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_sysbar_back_land.png
deleted file mode 100644 (file)
index a7fec49..0000000
Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_sysbar_back_land.png and /dev/null differ

diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_back_ime_land.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_back_ime_land.png
deleted file mode 100644 (file)
index 0feb405..0000000
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_back_ime_land.png and /dev/null differ

diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_back_land.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_back_land.png
deleted file mode 100644 (file)
index cabab0d..0000000
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_back_land.png and /dev/null differ

diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_home_land.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_home_land.png
deleted file mode 100644 (file)
index 16e1bf5..0000000
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_home_land.png and /dev/null differ

diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_menu_land.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_menu_land.png
deleted file mode 100644 (file)
index 94c9743..0000000
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_menu_land.png and /dev/null differ

diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_recent_land.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_recent_land.png
deleted file mode 100644 (file)
index 40375de..0000000
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_recent_land.png and /dev/null differ

diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_back_ime_land.png b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_back_ime_land.png
deleted file mode 100644 (file)
index b7b8f98..0000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_back_ime_land.png and /dev/null differ

diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_back_land.png b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_back_land.png
deleted file mode 100644 (file)
index 69b7449..0000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_back_land.png and /dev/null differ

diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_home_land.png b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_home_land.png
deleted file mode 100644 (file)
index 57d243c..0000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_home_land.png and /dev/null differ

diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_menu_land.png b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_menu_land.png
deleted file mode 100644 (file)
index 8a7ac4f..0000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_menu_land.png and /dev/null differ

diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_recent_land.png b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_recent_land.png
deleted file mode 100644 (file)
index e53eaff..0000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_recent_land.png and /dev/null differ

diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_back_ime_land.png b/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_back_ime_land.png
deleted file mode 100644 (file)
index 695e7a4..0000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_back_ime_land.png and /dev/null differ

diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_back_land.png b/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_back_land.png
deleted file mode 100644 (file)
index 88294c0..0000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_back_land.png and /dev/null differ

diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_home_land.png b/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_home_land.png
deleted file mode 100644 (file)
index 09d684a..0000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_home_land.png and /dev/null differ

diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_menu_land.png b/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_menu_land.png
deleted file mode 100644 (file)
index 62f44e8..0000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_menu_land.png and /dev/null differ

diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_recent_land.png b/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_recent_land.png
deleted file mode 100644 (file)
index e31ea32..0000000
Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_recent_land.png and /dev/null differ

diff --git a/packages/SystemUI/res/drawable-xxxhdpi/ic_sysbar_back_ime_land.png b/packages/SystemUI/res/drawable-xxxhdpi/ic_sysbar_back_ime_land.png
deleted file mode 100644 (file)
index 24f12d7..0000000
Binary files a/packages/SystemUI/res/drawable-xxxhdpi/ic_sysbar_back_ime_land.png and /dev/null differ

diff --git a/packages/SystemUI/res/drawable-xxxhdpi/ic_sysbar_back_land.png b/packages/SystemUI/res/drawable-xxxhdpi/ic_sysbar_back_land.png
deleted file mode 100644 (file)
index 51482f5..0000000
Binary files a/packages/SystemUI/res/drawable-xxxhdpi/ic_sysbar_back_land.png and /dev/null differ

diff --git a/packages/SystemUI/res/drawable-xxxhdpi/ic_sysbar_home_land.png b/packages/SystemUI/res/drawable-xxxhdpi/ic_sysbar_home_land.png
deleted file mode 100644 (file)
index 46c7b18..0000000
Binary files a/packages/SystemUI/res/drawable-xxxhdpi/ic_sysbar_home_land.png and /dev/null differ

diff --git a/packages/SystemUI/res/drawable-xxxhdpi/ic_sysbar_recent_land.png b/packages/SystemUI/res/drawable-xxxhdpi/ic_sysbar_recent_land.png
deleted file mode 100644 (file)
index 396ad7d..0000000
Binary files a/packages/SystemUI/res/drawable-xxxhdpi/ic_sysbar_recent_land.png and /dev/null differ

diff --git a/packages/SystemUI/res/layout/navigation_bar.xml b/packages/SystemUI/res/layout/navigation_bar.xml
index c92ba45..d58664f 100644 (file)
--- a/packages/SystemUI/res/layout/navigation_bar.xml
+++ b/packages/SystemUI/res/layout/navigation_bar.xml
@@ -213,7 +213,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="40dp"
                     android:contentDescription="@string/accessibility_menu"
-                    android:src="@drawable/ic_sysbar_menu_land"
+                    android:src="@drawable/ic_sysbar_menu"
                     android:scaleType="centerInside"
                     android:layout_gravity="top"
                     android:visibility="invisible"
@@ -223,7 +223,7 @@
             <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/recent_apps"
                 android:layout_height="@dimen/navigation_key_width"
                 android:layout_width="match_parent"
-                android:src="@drawable/ic_sysbar_recent_land"
+                android:src="@drawable/ic_sysbar_recent"
                 android:scaleType="center"
                 android:layout_weight="0"
                 android:contentDescription="@string/accessibility_recent"
@@ -237,7 +237,7 @@
             <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/home"
                 android:layout_height="@dimen/navigation_key_width"
                 android:layout_width="match_parent"
-                android:src="@drawable/ic_sysbar_home_land"
+                android:src="@drawable/ic_sysbar_home"
                 android:scaleType="center"
                 systemui:keyCode="3"
                 systemui:keyRepeat="false"
@@ -253,7 +253,7 @@
             <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/back"
                 android:layout_height="@dimen/navigation_key_width"
                 android:layout_width="match_parent"
-                android:src="@drawable/ic_sysbar_back_land"
+                android:src="@drawable/ic_sysbar_back"
                 android:scaleType="center"
                 systemui:keyCode="4"
                 android:layout_weight="0"

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
index cc31476..8046eb5 100644 (file)
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
@@ -257,11 +257,11 @@ public class NavigationBarView extends LinearLayout {
 
     private void getIcons(Resources res) {
         mBackIcon = res.getDrawable(R.drawable.ic_sysbar_back);
-        mBackLandIcon = res.getDrawable(R.drawable.ic_sysbar_back_land);
+        mBackLandIcon = mBackIcon;
         mBackAltIcon = res.getDrawable(R.drawable.ic_sysbar_back_ime);
-        mBackAltLandIcon = res.getDrawable(R.drawable.ic_sysbar_back_ime_land);
+        mBackAltLandIcon = mBackAltIcon;
         mRecentIcon = res.getDrawable(R.drawable.ic_sysbar_recent);
-        mRecentLandIcon = res.getDrawable(R.drawable.ic_sysbar_recent_land);
+        mRecentLandIcon = mRecentIcon;
     }
 
     @Override