summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
authorTony Wickham <twickham@google.com>2017-05-19 19:36:38 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-05-19 19:36:38 +0000
commitfda3107c8b7c88bb07f6d54d238b8326220ea7be (patch)
tree56d8e2aae6311658ae89832c54cb5166a14f0c73 /res/layout
parent3720c69322210e2e196ad93bf856eadc3a956177 (diff)
parent440052ce5d936fffe025815d35507cde9fc0dbdc (diff)
downloadandroid_packages_apps_Trebuchet-fda3107c8b7c88bb07f6d54d238b8326220ea7be.tar.gz
android_packages_apps_Trebuchet-fda3107c8b7c88bb07f6d54d238b8326220ea7be.tar.bz2
android_packages_apps_Trebuchet-fda3107c8b7c88bb07f6d54d238b8326220ea7be.zip
Merge "Make expanded system shortcuts clickable" into ub-launcher3-dorval
am: 440052ce5d Change-Id: I5d53a468bb4aa3060e3e7e618bfdbdb537a5aadc
Diffstat (limited to 'res/layout')
-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 095270336..6f702f62b 100644
--- a/res/layout/system_shortcut.xml
+++ b/res/layout/system_shortcut.xml
@@ -33,7 +33,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"