summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/res/layout-sw600dp
diff options
context:
space:
mode:
authorRoman Birg <romanbirg@gmail.com>2012-12-11 04:12:41 -0600
committerDanesh M <daneshm90@gmail.com>2015-11-05 17:31:43 -0800
commit78d1179c730973d82824f56ad1d7e8db073a24bb (patch)
tree41ff524050c0dad1f03bdc362ac156c68a7ecdbc /packages/SystemUI/res/layout-sw600dp
parent2ffc3a48d87341404076a3d1da596e4ffa6860a1 (diff)
downloadframeworks_base-78d1179c730973d82824f56ad1d7e8db073a24bb.zip
frameworks_base-78d1179c730973d82824f56ad1d7e8db073a24bb.tar.gz
frameworks_base-78d1179c730973d82824f56ad1d7e8db073a24bb.tar.bz2
SystemUI: add left and right virtual buttons while typing
Adapt for cm-12.0. Squashes the following commits: Fix side button visibility tracking. Previously one could e.g. get legacy menu button being visible in certain scenarios, like this one: - Open legacy app, e.g. CatLog - Invoke IME - Lock screen - Unlock screen - Result: Menu button visible in keyguard Change-Id: Ia796f73ec995ea1cc34d38f8aefdbccda7be7565 SystemUI: fix up navigation cursor keyevent flags Volume cursor controls use slightly different flags to keep the cursor within the field. Match them in the SystemUI for consistent (and better) behavior. Change-Id: I56d597f111ec611b0ca24a10f30575401fa76d18 Signed-off-by: Roman Birg <roman@cyngn.com> SystemUI: fix up initial cursor down flags on nav bar We were using the regular flags for the initial ACTION_DOWN event so the FLAG_KEEP_TOUCH_MODE was not being passed and allowed the cursor to jump out of bounds slightly. Change-Id: I5b4d2a5e5e0ce562985fcc3b7b6fac8b4abc49da Signed-off-by: Roman Birg <roman@cyngn.com> Change-Id: Iea446443d33ff305765e47c86523b619676116ac
Diffstat (limited to 'packages/SystemUI/res/layout-sw600dp')
-rw-r--r--packages/SystemUI/res/layout-sw600dp/mid_navigation_bar_land.xml33
-rw-r--r--packages/SystemUI/res/layout-sw600dp/mid_navigation_bar_port.xml33
2 files changed, 53 insertions, 13 deletions
diff --git a/packages/SystemUI/res/layout-sw600dp/mid_navigation_bar_land.xml b/packages/SystemUI/res/layout-sw600dp/mid_navigation_bar_land.xml
index 3e146ea..6b1184a 100644
--- a/packages/SystemUI/res/layout-sw600dp/mid_navigation_bar_land.xml
+++ b/packages/SystemUI/res/layout-sw600dp/mid_navigation_bar_land.xml
@@ -31,6 +31,14 @@
android:layout_width="match_parent"
android:layout_height="wrap_content" >
<com.android.systemui.statusbar.policy.KeyButtonView
+ android:id="@+id/dpad_left"
+ android:visibility="gone"
+ android:layout_width="48dp"
+ android:layout_height="match_parent"
+ android:layout_weight="0"
+ android:scaleType="fitCenter"
+ systemui:keyRepeat="true" />
+ <com.android.systemui.statusbar.policy.KeyButtonView
android:id="@+id/one"
android:layout_width="48dp"
android:layout_height="match_parent"
@@ -88,11 +96,22 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1" />
- <com.android.systemui.statusbar.policy.KeyButtonView
- android:id="@+id/six"
- android:layout_width="48dp"
- android:layout_height="match_parent"
- android:layout_weight="0"
- android:scaleType="fitCenter" />
-
+ <FrameLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+ <com.android.systemui.statusbar.policy.KeyButtonView
+ android:id="@+id/dpad_right"
+ android:visibility="gone"
+ android:layout_width="48dp"
+ android:layout_height="match_parent"
+ android:layout_weight="0"
+ android:scaleType="fitCenter"
+ systemui:keyRepeat="true"/>
+ <com.android.systemui.statusbar.policy.KeyButtonView
+ android:id="@+id/six"
+ android:layout_width="48dp"
+ android:layout_height="match_parent"
+ android:layout_weight="0"
+ android:scaleType="fitCenter"/>
+ </FrameLayout>
</LinearLayout>
diff --git a/packages/SystemUI/res/layout-sw600dp/mid_navigation_bar_port.xml b/packages/SystemUI/res/layout-sw600dp/mid_navigation_bar_port.xml
index 3034280..3253b92 100644
--- a/packages/SystemUI/res/layout-sw600dp/mid_navigation_bar_port.xml
+++ b/packages/SystemUI/res/layout-sw600dp/mid_navigation_bar_port.xml
@@ -26,12 +26,25 @@
android:clipChildren="false"
android:clipToPadding="false"
android:id="@+id/nav_buttons">
- <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" />
+ <FrameLayout
+ android:layout_width="@dimen/navigation_extra_key_width"
+ android:layout_height="match_parent"
+ android:layout_weight="0">
+ <com.android.systemui.statusbar.policy.KeyButtonView
+ android:id="@+id/dpad_left"
+ android:visibility="gone"
+ android:layout_width="48dp"
+ android:layout_height="match_parent"
+ android:layout_weight="0"
+ android:scaleType="fitCenter"
+ 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" />
+ </FrameLayout>
<View
android:layout_width="0dp"
android:layout_height="match_parent"
@@ -94,6 +107,14 @@
android:layout_height="match_parent"
android:layout_weight="0"
android:scaleType="fitCenter" />
+ <com.android.systemui.statusbar.policy.KeyButtonView
+ android:id="@+id/dpad_right"
+ android:visibility="gone"
+ android:layout_width="48dp"
+ android:layout_height="match_parent"
+ android:layout_weight="0"
+ android:scaleType="fitCenter"
+ systemui:keyRepeat="true" />
</FrameLayout>
</LinearLayout>