drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add IME Switcher icon to Navigation Bar

Browse Source 
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
This commit is contained in:
Jason Monk
2014-04-29 16:50:53 -04:00
parent 627aad9c20
commit f1ff209523
12 changed files with 192 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
packages/SystemUI/res/layout-sw600dp/navigation_bar.xml
View File

@ -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 -->