From 26ad50ddab33e094e95b94a050fb0c61a2fc4d07 Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Tue, 5 May 2020 13:21:25 +0100
Subject: [PATCH] Add state_pressed to keyguard user switcher item.

This means that we will see the ripple effect when clicking user
switcher items that don't take on the "activated" state.

Bug: 150682160
Test: Manual
Change-Id: I397c0177ddaaa46eaad6dfa5c9af27b96d3e0bf8
---
 .../res/color/kg_user_switcher_rounded_background_color.xml  | 5 +++--
 .../com/android/systemui/qs/tiles/UserDetailItemView.java    | 1 +
 .../systemui/statusbar/policy/KeyguardUserSwitcher.java      | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/SystemUI/res/color/kg_user_switcher_rounded_background_color.xml b/packages/SystemUI/res/color/kg_user_switcher_rounded_background_color.xml
index b16d038f68f26..3660dc4b17f0c 100644
--- a/packages/SystemUI/res/color/kg_user_switcher_rounded_background_color.xml
+++ b/packages/SystemUI/res/color/kg_user_switcher_rounded_background_color.xml
@@ -17,6 +17,7 @@
   -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_activated="true" android:color="@color/kg_user_switcher_activated_background_color" />
+    <item android:state_activated="true" android_state_enabled="true" android:color="@color/kg_user_switcher_activated_background_color" />
+    <item android:state_pressed="true" android:state_enabled="true" android:color="@color/kg_user_switcher_activated_background_color" />
     <item android:color="@android:color/transparent" />
-</selector>
\ No newline at end of file
+</selector>
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/UserDetailItemView.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/UserDetailItemView.java
index 6249f82ace9e1..aa63b4077b1b1 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/UserDetailItemView.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/UserDetailItemView.java
@@ -106,6 +106,7 @@ public class UserDetailItemView extends LinearLayout {
     }
 
     public void setEnabled(boolean enabled) {
+        super.setEnabled(enabled);
         mName.setEnabled(enabled);
         mAvatar.setEnabled(enabled);
     }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardUserSwitcher.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardUserSwitcher.java
index f8da03a49b503..df3748a8606b8 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardUserSwitcher.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardUserSwitcher.java
@@ -298,6 +298,7 @@ public class KeyguardUserSwitcher {
             convertView.setAlpha(
                     item.isCurrent || item.isSwitchToEnabled ? USER_SWITCH_ENABLED_ALPHA
                             : USER_SWITCH_DISABLED_ALPHA);
+            convertView.setEnabled(item.isSwitchToEnabled);
             return convertView;
         }