From 1c4b21071c182761ac70f27a95011745432064e5 Mon Sep 17 00:00:00 2001
From: Evan Laird <evanlaird@google.com>
Date: Fri, 30 Aug 2019 15:57:01 -0400
Subject: [PATCH] Make taps on the row toggle switches

Test: manual; systemUI tests
Fixes: 138948956
Change-Id: I6a654ce959871e7286bc45b50b4e9a9499f8e401
---
 packages/SystemUI/res/layout/notif_half_shelf.xml             | 4 +++-
 packages/SystemUI/res/layout/notif_half_shelf_row.xml         | 4 +++-
 .../statusbar/notification/row/ChannelEditorListView.kt       | 3 +++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/packages/SystemUI/res/layout/notif_half_shelf.xml b/packages/SystemUI/res/layout/notif_half_shelf.xml
index 26c8872313492..d36c1a8c961b4 100644
--- a/packages/SystemUI/res/layout/notif_half_shelf.xml
+++ b/packages/SystemUI/res/layout/notif_half_shelf.xml
@@ -46,7 +46,9 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:padding="8dp"
-                android:orientation="horizontal" >
+                android:orientation="horizontal"
+                android:clickable="true"
+                android:foreground="?android:attr/selectableItemBackground" >
 
                 <ImageView
                     android:id="@+id/icon"
diff --git a/packages/SystemUI/res/layout/notif_half_shelf_row.xml b/packages/SystemUI/res/layout/notif_half_shelf_row.xml
index b95d5e9a43f6c..c863e02d53134 100644
--- a/packages/SystemUI/res/layout/notif_half_shelf_row.xml
+++ b/packages/SystemUI/res/layout/notif_half_shelf_row.xml
@@ -20,7 +20,9 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:padding="8dp"
-    android:orientation="horizontal" >
+    android:clickable="true"
+    android:orientation="horizontal"
+    android:foreground="?android:attr/selectableItemBackground" >
 
     <!-- This is where an icon would go *if we wanted one* **wink** -->
     <Space
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ChannelEditorListView.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ChannelEditorListView.kt
index 6faf77ec60c7e..983315ed98e74 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ChannelEditorListView.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ChannelEditorListView.kt
@@ -129,6 +129,8 @@ class AppControlView(c: Context, attrs: AttributeSet) : LinearLayout(c, attrs) {
         iconView = findViewById(R.id.icon)
         channelName = findViewById(R.id.app_name)
         switch = findViewById(R.id.toggle)
+
+        setOnClickListener { switch.toggle() }
     }
 }
 
@@ -156,6 +158,7 @@ class ChannelRow(c: Context, attrs: AttributeSet) : LinearLayout(c, attrs) {
                 controller.proposeEditForChannel(it, if (b) it.importance else IMPORTANCE_NONE)
             }
         }
+        setOnClickListener { switch.toggle() }
     }
 
     private fun updateViews() {