summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI
diff options
context:
space:
mode:
authorAdrian Roos <roosa@google.com>2014-11-20 21:26:00 +0000
committerandroid-build-merger <android-build-merger@google.com>2014-11-20 21:26:00 +0000
commit4533e197bf999c6b68bdb04cad7d4bdee80b6448 (patch)
tree09585d4308ba8842bf631fdbce6883cc36b4b46f /packages/SystemUI
parent224a0640c988a33aace9b2a81548613067fb7ca8 (diff)
parent71cf9e58a14b942ad313d0c5c280e207933e9841 (diff)
downloadframeworks_base-4533e197bf999c6b68bdb04cad7d4bdee80b6448.zip
frameworks_base-4533e197bf999c6b68bdb04cad7d4bdee80b6448.tar.gz
frameworks_base-4533e197bf999c6b68bdb04cad7d4bdee80b6448.tar.bz2
am cbd48c72: Merge "Honey I shrunk the navigation bar" into lmp-mr1-dev
automerge: 71cf9e5 * commit '71cf9e58a14b942ad313d0c5c280e207933e9841': Honey I shrunk the navigation bar
Diffstat (limited to 'packages/SystemUI')
-rw-r--r--packages/SystemUI/res/layout-sw600dp/navigation_bar.xml8
1 files changed, 8 insertions, 0 deletions
diff --git a/packages/SystemUI/res/layout-sw600dp/navigation_bar.xml b/packages/SystemUI/res/layout-sw600dp/navigation_bar.xml
index 5c776e6..456d2f9 100644
--- a/packages/SystemUI/res/layout-sw600dp/navigation_bar.xml
+++ b/packages/SystemUI/res/layout-sw600dp/navigation_bar.xml
@@ -57,6 +57,7 @@
android:layout_width="128dp" android:paddingStart="25dp" android:paddingEnd="25dp"
android:layout_height="match_parent"
android:src="@drawable/ic_sysbar_back"
+ android:scaleType="centerInside"
systemui:keyCode="4"
android:layout_weight="0"
android:contentDescription="@string/accessibility_back"
@@ -65,6 +66,7 @@
android:layout_width="128dp" android:paddingStart="25dp" android:paddingEnd="25dp"
android:layout_height="match_parent"
android:src="@drawable/ic_sysbar_home"
+ android:scaleType="centerInside"
systemui:keyCode="3"
systemui:keyRepeat="true"
android:layout_weight="0"
@@ -74,6 +76,7 @@
android:layout_width="128dp" android:paddingStart="25dp" android:paddingEnd="25dp"
android:layout_height="match_parent"
android:src="@drawable/ic_sysbar_recent"
+ android:scaleType="centerInside"
android:layout_weight="0"
android:contentDescription="@string/accessibility_recent"
/>
@@ -91,6 +94,7 @@
android:layout_width="@dimen/navigation_extra_key_width"
android:layout_height="match_parent"
android:src="@drawable/ic_sysbar_menu"
+ android:scaleType="centerInside"
android:layout_marginEnd="2dp"
systemui:keyCode="82"
android:visibility="invisible"
@@ -198,6 +202,7 @@
android:layout_width="162dp" android:paddingStart="42dp" android:paddingEnd="42dp"
android:layout_height="match_parent"
android:src="@drawable/ic_sysbar_back"
+ android:scaleType="centerInside"
systemui:keyCode="4"
android:layout_weight="0"
android:contentDescription="@string/accessibility_back"
@@ -206,6 +211,7 @@
android:layout_width="162dp" android:paddingStart="42dp" android:paddingEnd="42dp"
android:layout_height="match_parent"
android:src="@drawable/ic_sysbar_home"
+ android:scaleType="centerInside"
systemui:keyCode="3"
systemui:keyRepeat="true"
android:layout_weight="0"
@@ -215,6 +221,7 @@
android:layout_width="162dp" android:paddingStart="42dp" android:paddingEnd="42dp"
android:layout_height="match_parent"
android:src="@drawable/ic_sysbar_recent"
+ android:scaleType="centerInside"
android:layout_weight="0"
android:contentDescription="@string/accessibility_recent"
/>
@@ -233,6 +240,7 @@
android:layout_height="match_parent"
android:layout_marginEnd="2dp"
android:src="@drawable/ic_sysbar_menu"
+ android:scaleType="centerInside"
systemui:keyCode="82"
android:visibility="invisible"
android:contentDescription="@string/accessibility_menu" />