diff options
| author | Jason Monk <jmonk@google.com> | 2014-04-29 16:50:53 -0400 |
|---|---|---|
| committer | Jason Monk <jmonk@google.com> | 2014-05-02 09:39:41 -0400 |
| commit | f1ff209523a2474cb0e7aab0e083596c4afbe37f (patch) | |
| tree | 37e9c1a5eb651ae9ac5123fdf3bfd264bebebb27 /packages/SystemUI/res/layout-sw600dp | |
| parent | 627aad9c200cb19aa505504dcd232a3710e96a25 (diff) | |
| download | frameworks_base-f1ff209523a2474cb0e7aab0e083596c4afbe37f.zip frameworks_base-f1ff209523a2474cb0e7aab0e083596c4afbe37f.tar.gz frameworks_base-f1ff209523a2474cb0e7aab0e083596c4afbe37f.tar.bz2 | |
Add IME Switcher icon to Navigation Bar
Adds button in the same location as the menu button and overrides
it when present. The setNavigationHintIconHints lets it know when
the button should be shown.
Bug: 14257632
Change-Id: Ia80de7fd2390cd8b083e37cbe58b7ee53555e619
Diffstat (limited to 'packages/SystemUI/res/layout-sw600dp')
| -rw-r--r-- | packages/SystemUI/res/layout-sw600dp/navigation_bar.xml | 70 |
1 files changed, 50 insertions, 20 deletions
diff --git a/packages/SystemUI/res/layout-sw600dp/navigation_bar.xml b/packages/SystemUI/res/layout-sw600dp/navigation_bar.xml index b9ad799..6a2e3c6 100644 --- a/packages/SystemUI/res/layout-sw600dp/navigation_bar.xml +++ b/packages/SystemUI/res/layout-sw600dp/navigation_bar.xml @@ -42,7 +42,7 @@ <!-- navigation controls --> <View - android:layout_width="48dp" + android:layout_width="@dimen/navigation_extra_key_width" android:layout_height="match_parent" android:layout_weight="0" android:layout_marginStart="2dp" @@ -85,17 +85,32 @@ android:layout_height="match_parent" android:layout_weight="1" /> - <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/menu" - android:layout_width="48dp" + <FrameLayout + android:layout_width="@dimen/navigation_extra_key_width" android:layout_height="match_parent" - android:src="@drawable/ic_sysbar_menu" - android:layout_marginEnd="2dp" - systemui:keyCode="82" android:layout_weight="0" - android:visibility="invisible" - android:contentDescription="@string/accessibility_menu" - systemui:glowBackground="@drawable/ic_sysbar_highlight" - /> + android:layout_marginEnd="2dp" > + <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/menu" + android:layout_width="@dimen/navigation_extra_key_width" + android:layout_height="match_parent" + android:src="@drawable/ic_sysbar_menu" + android:layout_marginEnd="2dp" + systemui:keyCode="82" + android:visibility="invisible" + android:contentDescription="@string/accessibility_menu" + systemui:glowBackground="@drawable/ic_sysbar_highlight" + /> + <com.android.systemui.statusbar.policy.KeyButtonView + android:id="@+id/ime_switcher" + android:layout_width="@dimen/navigation_extra_key_width" + android:layout_height="match_parent" + android:layout_marginEnd="2dp" + android:scaleType="centerInside" + android:src="@drawable/ic_ime_switcher_default" + android:visibility="invisible" + android:contentDescription="@string/accessibility_ime_switch_button" + systemui:glowBackground="@drawable/ic_sysbar_highlight" /> + </FrameLayout> </LinearLayout> <!-- lights out layout to match exactly --> @@ -184,7 +199,7 @@ <!-- navigation controls --> <View - android:layout_width="48dp" + android:layout_width="@dimen/navigation_extra_key_width" android:layout_height="match_parent" android:layout_weight="0" android:layout_marginStart="2dp" @@ -227,17 +242,32 @@ android:layout_height="match_parent" android:layout_weight="1" /> - <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/menu" - android:layout_width="48dp" + <FrameLayout + android:layout_width="@dimen/navigation_extra_key_width" android:layout_height="match_parent" android:layout_marginEnd="2dp" - android:src="@drawable/ic_sysbar_menu" - systemui:keyCode="82" - android:layout_weight="0" - android:visibility="invisible" - android:contentDescription="@string/accessibility_menu" - systemui:glowBackground="@drawable/ic_sysbar_highlight" - /> + android:layout_weight="0" > + <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/menu" + android:layout_width="@dimen/navigation_extra_key_width" + android:layout_height="match_parent" + android:layout_marginEnd="2dp" + android:src="@drawable/ic_sysbar_menu" + systemui:keyCode="82" + android:visibility="invisible" + android:contentDescription="@string/accessibility_menu" + systemui:glowBackground="@drawable/ic_sysbar_highlight" + /> + <com.android.systemui.statusbar.policy.KeyButtonView + android:id="@+id/ime_switcher" + android:layout_width="@dimen/navigation_extra_key_width" + android:layout_height="match_parent" + android:layout_marginEnd="2dp" + android:src="@drawable/ic_ime_switcher_default" + android:visibility="invisible" + android:contentDescription="@string/accessibility_ime_switch_button" + android:scaleType="centerInside" + systemui:glowBackground="@drawable/ic_sysbar_highlight" /> + </FrameLayout> </LinearLayout> <!-- lights out layout to match exactly --> |