am cbd48c72: Merge "Honey I shrunk the navigation bar" into lmp-mr1-dev

* commit 'cbd48c722a40aff8bc2855d735bd34159b5df8ba':
  Honey I shrunk the navigation bar
This commit is contained in:
Adrian Roos
2014-11-20 14:58:49 +00:00
committed by Android Git Automerger

View File

@@ -57,6 +57,7 @@
android:layout_width="128dp" android:paddingStart="25dp" android:paddingEnd="25dp" android:layout_width="128dp" android:paddingStart="25dp" android:paddingEnd="25dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:src="@drawable/ic_sysbar_back" android:src="@drawable/ic_sysbar_back"
android:scaleType="centerInside"
systemui:keyCode="4" systemui:keyCode="4"
android:layout_weight="0" android:layout_weight="0"
android:contentDescription="@string/accessibility_back" android:contentDescription="@string/accessibility_back"
@@ -65,6 +66,7 @@
android:layout_width="128dp" android:paddingStart="25dp" android:paddingEnd="25dp" android:layout_width="128dp" android:paddingStart="25dp" android:paddingEnd="25dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:src="@drawable/ic_sysbar_home" android:src="@drawable/ic_sysbar_home"
android:scaleType="centerInside"
systemui:keyCode="3" systemui:keyCode="3"
systemui:keyRepeat="true" systemui:keyRepeat="true"
android:layout_weight="0" android:layout_weight="0"
@@ -74,6 +76,7 @@
android:layout_width="128dp" android:paddingStart="25dp" android:paddingEnd="25dp" android:layout_width="128dp" android:paddingStart="25dp" android:paddingEnd="25dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:src="@drawable/ic_sysbar_recent" android:src="@drawable/ic_sysbar_recent"
android:scaleType="centerInside"
android:layout_weight="0" android:layout_weight="0"
android:contentDescription="@string/accessibility_recent" android:contentDescription="@string/accessibility_recent"
/> />
@@ -91,6 +94,7 @@
android:layout_width="@dimen/navigation_extra_key_width" android:layout_width="@dimen/navigation_extra_key_width"
android:layout_height="match_parent" android:layout_height="match_parent"
android:src="@drawable/ic_sysbar_menu" android:src="@drawable/ic_sysbar_menu"
android:scaleType="centerInside"
android:layout_marginEnd="2dp" android:layout_marginEnd="2dp"
systemui:keyCode="82" systemui:keyCode="82"
android:visibility="invisible" android:visibility="invisible"
@@ -198,6 +202,7 @@
android:layout_width="162dp" android:paddingStart="42dp" android:paddingEnd="42dp" android:layout_width="162dp" android:paddingStart="42dp" android:paddingEnd="42dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:src="@drawable/ic_sysbar_back" android:src="@drawable/ic_sysbar_back"
android:scaleType="centerInside"
systemui:keyCode="4" systemui:keyCode="4"
android:layout_weight="0" android:layout_weight="0"
android:contentDescription="@string/accessibility_back" android:contentDescription="@string/accessibility_back"
@@ -206,6 +211,7 @@
android:layout_width="162dp" android:paddingStart="42dp" android:paddingEnd="42dp" android:layout_width="162dp" android:paddingStart="42dp" android:paddingEnd="42dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:src="@drawable/ic_sysbar_home" android:src="@drawable/ic_sysbar_home"
android:scaleType="centerInside"
systemui:keyCode="3" systemui:keyCode="3"
systemui:keyRepeat="true" systemui:keyRepeat="true"
android:layout_weight="0" android:layout_weight="0"
@@ -215,6 +221,7 @@
android:layout_width="162dp" android:paddingStart="42dp" android:paddingEnd="42dp" android:layout_width="162dp" android:paddingStart="42dp" android:paddingEnd="42dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:src="@drawable/ic_sysbar_recent" android:src="@drawable/ic_sysbar_recent"
android:scaleType="centerInside"
android:layout_weight="0" android:layout_weight="0"
android:contentDescription="@string/accessibility_recent" android:contentDescription="@string/accessibility_recent"
/> />
@@ -233,6 +240,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginEnd="2dp" android:layout_marginEnd="2dp"
android:src="@drawable/ic_sysbar_menu" android:src="@drawable/ic_sysbar_menu"
android:scaleType="centerInside"
systemui:keyCode="82" systemui:keyCode="82"
android:visibility="invisible" android:visibility="invisible"
android:contentDescription="@string/accessibility_menu" /> android:contentDescription="@string/accessibility_menu" />