diff options
| author | 2020-05-12 13:33:50 +0000 | |
|---|---|---|
| committer | 2020-05-12 13:33:50 +0000 | |
| commit | 701957749856236419d08b979019731654d00615 (patch) | |
| tree | 22e0d90e4a9d63379b439b98b6a9cdc190885015 | |
| parent | 1de67aa2319af0793a4b3ac564d7e3ed9cce1298 (diff) | |
| parent | 26ad50ddab33e094e95b94a050fb0c61a2fc4d07 (diff) | |
Merge "Add state_pressed to keyguard user switcher item." into rvc-dev
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 b16d038f68f2..3660dc4b17f0 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 6249f82ace9e..aa63b4077b1b 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 f8da03a49b50..df3748a8606b 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; } |