summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Wickham <twickham@google.com>2017-05-17 17:26:10 -0700
committerTony Wickham <twickham@google.com>2017-05-18 11:16:58 -0700
commitcd58d0d4e5f538c518b40ac60021cee727559806 (patch)
tree1a0f6c4d461be5fe6edaf67ed3fbb07d19ecf490
parent0270039b98ec2cb4e641c88dabea0ca157d55596 (diff)
downloadandroid_packages_apps_Trebuchet-cd58d0d4e5f538c518b40ac60021cee727559806.tar.gz
android_packages_apps_Trebuchet-cd58d0d4e5f538c518b40ac60021cee727559806.tar.bz2
android_packages_apps_Trebuchet-cd58d0d4e5f538c518b40ac60021cee727559806.zip
Make expanded system shortcuts clickable
The textview on top was consuming the clicks, so we set it to not be focusable (clicks are handled by the parent). This regression was caused by a TextView bug introduced in ag/2247666, which set clickable=true if focusable=true. Bug: 38385679 Change-Id: I0a946073919dabcd19b47cd7df2a1fcac6946cd5
-rw-r--r--res/layout/system_shortcut.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/res/layout/system_shortcut.xml b/res/layout/system_shortcut.xml
index 83ad9f291..bf849aa2d 100644
--- a/res/layout/system_shortcut.xml
+++ b/res/layout/system_shortcut.xml
@@ -32,7 +32,8 @@
android:textColor="?android:attr/textColorPrimary"
android:fontFamily="sans-serif"
launcher:iconDisplay="shortcut_popup"
- launcher:layoutHorizontal="true" />
+ launcher:layoutHorizontal="true"
+ android:focusable="false" />
<View
android:id="@+id/icon"