SystemUI: fix incorrectly sized nav bar icons

Change-Id: Ief45ac0ed54f5a22477d54f685ec423350fc467c
Signed-off-by: Roman Birg <roman@cyngn.com>

2 files changed, 16 insertions, 6 deletions

diff --git a/packages/SystemUI/res/layout/mid_navigation_bar_land.xml b/packages/SystemUI/res/layout/mid_navigation_bar_land.xml
index 137070d..6a1f7aa 100644
--- a/packages/SystemUI/res/layout/mid_navigation_bar_land.xml
+++ b/packages/SystemUI/res/layout/mid_navigation_bar_land.xml
@@ -39,6 +39,7 @@
 
         <com.android.systemui.statusbar.policy.KeyButtonView
             android:id="@+id/one"
+            android:scaleType="centerInside"
             android:layout_height="40dp"
             android:layout_width="match_parent"
             android:layout_weight="0" />
@@ -48,7 +49,7 @@
             android:layout_width="match_parent"
             android:layout_height="40dp"
             android:layout_weight="0"
-            android:scaleType="fitCenter"
+            android:scaleType="centerInside"
             systemui:keyRepeat="true"/>
     </FrameLayout>
     <LinearLayout
@@ -64,6 +65,7 @@
         android:animateLayoutChanges="true">
         <com.android.systemui.statusbar.policy.KeyButtonView
             android:id="@+id/two"
+            android:scaleType="centerInside"
             android:layout_height="80dp"
             android:layout_width="match_parent"
             android:layout_weight="0"
@@ -75,6 +77,7 @@
             android:visibility="invisible" />
         <com.android.systemui.statusbar.policy.KeyButtonView
             android:id="@+id/three"
+            android:scaleType="centerInside"
             android:layout_height="80dp"
             android:layout_width="match_parent"
             systemui:keyRepeat="true"
@@ -86,6 +89,7 @@
             android:visibility="invisible" />
         <com.android.systemui.statusbar.policy.KeyButtonView
             android:id="@+id/four"
+            android:scaleType="centerInside"
             android:layout_height="80dp"
             android:layout_width="match_parent"
             android:layout_weight="0"
@@ -97,6 +101,7 @@
             android:visibility="invisible" />
         <com.android.systemui.statusbar.policy.KeyButtonView
             android:id="@+id/five"
+            android:scaleType="centerInside"
             android:layout_height="80dp"
             android:layout_width="match_parent"
             android:layout_weight="0"
@@ -111,10 +116,11 @@
             android:layout_width="match_parent"
             android:layout_height="40dp"
             android:layout_weight="0"
-            android:scaleType="fitCenter"
+            android:scaleType="centerInside"
             systemui:keyRepeat="true" />
         <com.android.systemui.statusbar.policy.KeyButtonView
             android:id="@+id/six"
+            android:scaleType="centerInside"
             android:layout_height="40dp"
             android:layout_width="match_parent"
             android:layout_weight="0"
diff --git a/packages/SystemUI/res/layout/mid_navigation_bar_port.xml b/packages/SystemUI/res/layout/mid_navigation_bar_port.xml
index 284620e..6dfdc16 100644
--- a/packages/SystemUI/res/layout/mid_navigation_bar_port.xml
+++ b/packages/SystemUI/res/layout/mid_navigation_bar_port.xml
@@ -35,14 +35,14 @@
             android:layout_width="40dp"
             android:layout_height="match_parent"
             android:layout_weight="0"
-            android:scaleType="fitCenter"
+            android:scaleType="centerInside"
             systemui:keyRepeat="true" />
         <com.android.systemui.statusbar.policy.KeyButtonView
             android:id="@+id/one"
             android:layout_width="@dimen/navigation_extra_key_width"
             android:layout_height="match_parent"
             android:layout_weight="0"
-            android:scaleType="fitCenter" />
+            android:scaleType="centerInside" />
     </FrameLayout>
     <LinearLayout
         android:layout_height="match_parent"
@@ -56,6 +56,7 @@
         android:animateLayoutChanges="true">
         <com.android.systemui.statusbar.policy.KeyButtonView
             android:id="@+id/two"
+            android:scaleType="centerInside"
             android:layout_width="@dimen/navigation_key_width"
             android:layout_height="match_parent"
             systemui:keyRepeat="true"
@@ -66,6 +67,7 @@
             android:layout_weight="1" />
         <com.android.systemui.statusbar.policy.KeyButtonView
             android:id="@+id/three"
+            android:scaleType="centerInside"
             android:layout_width="@dimen/navigation_key_width"
             android:layout_height="match_parent"
             systemui:keyRepeat="true"
@@ -76,6 +78,7 @@
             android:layout_weight="1" />
         <com.android.systemui.statusbar.policy.KeyButtonView
             android:id="@+id/four"
+            android:scaleType="centerInside"
             android:layout_width="@dimen/navigation_key_width"
             android:layout_height="match_parent"
             android:layout_weight="0"
@@ -86,6 +89,7 @@
             android:layout_weight="1" />
         <com.android.systemui.statusbar.policy.KeyButtonView
             android:id="@+id/five"
+            android:scaleType="centerInside"
             android:layout_width="@dimen/navigation_key_width"
             android:layout_height="match_parent"
             android:layout_weight="0"
@@ -109,14 +113,14 @@
             android:layout_width="@dimen/navigation_extra_key_width"
             android:layout_height="match_parent"
             android:layout_weight="0"
-            android:scaleType="fitCenter" />
+            android:scaleType="centerInside" />
         <com.android.systemui.statusbar.policy.KeyButtonView
             android:id="@+id/dpad_right"
             android:visibility="gone"
             android:layout_width="40dp"
             android:layout_height="match_parent"
             android:layout_weight="0"
-            android:scaleType="fitCenter"
+            android:scaleType="centerInside"
             systemui:keyRepeat="true"/>
     </FrameLayout>
 </LinearLayout>