From cd58d0d4e5f538c518b40ac60021cee727559806 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Wed, 17 May 2017 17:26:10 -0700
Subject: [PATCH] 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
---
 res/layout/system_shortcut.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/res/layout/system_shortcut.xml b/res/layout/system_shortcut.xml
index 83ad9f291a..bf849aa2d0 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"