Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add state_pressed to keyguard user switcher item." into rvc-dev am: 7019577498 am: 9f41c80044 am: 1cd9d73c0d

Browse Source 
Change-Id: I418b72ea602a4236fb3428eb04784c8989ecd177
This commit is contained in:
Ben Murdoch
2020-05-12 14:14:57 +00:00
committed by Automerger Merge Worker
parent 5be61dde17 1cd9d73c0d
commit c49f71c963
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/res/color/kg_user_switcher_rounded_background_color.xml
View File

@@ -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>
</selector>

1
packages/SystemUI/src/com/android/systemui/qs/tiles/UserDetailItemView.java
View File

@@ -106,6 +106,7 @@ public class UserDetailItemView extends LinearLayout {
}
public void setEnabled(boolean enabled) {
super.setEnabled(enabled);
mName.setEnabled(enabled);
mAvatar.setEnabled(enabled);
}

1
packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardUserSwitcher.java
View File

@@ -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;
}