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

diff --git a/res/layout/system_shortcut.xml b/res/layout/system_shortcut.xml
index 83ad9f2..bf849aa 100644 (file)
--- 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"