Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fecb106b authored by Ben Murdoch's avatar Ben Murdoch Committed by Automerger Merge Worker
Browse files

Merge "Add state_pressed to keyguard user switcher item." into rvc-dev am:... 

Merge "Add state_pressed to keyguard user switcher item." into rvc-dev am: 70195774 am: 9f41c800 am: 1cd9d73c am: c49f71c9

Change-Id: I8001cdee170d7e56d700bea11b45dad969f1ad52
parents e20a7f6a c49f71c9

packages/SystemUI/res/color/kg_user_switcher_rounded_background_color.xml

+3 −2
Original line number Original line Diff line number Diff line
@@ -17,6 +17,7 @@ 
  -->

  -->





<selector xmlns:android="http://schemas.android.com/apk/res/android">

<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" />

    <item android:color="@android:color/transparent" />

</selector>
 
</selector>

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -106,6 +106,7 @@ public class UserDetailItemView extends LinearLayout { 
    }

    }





    public void setEnabled(boolean enabled) {

    public void setEnabled(boolean enabled) {

        super.setEnabled(enabled);

        mName.setEnabled(enabled);

        mName.setEnabled(enabled);

        mAvatar.setEnabled(enabled);

        mAvatar.setEnabled(enabled);

    }

    }

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -298,6 +298,7 @@ public class KeyguardUserSwitcher { 
            convertView.setAlpha(

            convertView.setAlpha(

                    item.isCurrent || item.isSwitchToEnabled ? USER_SWITCH_ENABLED_ALPHA

                    item.isCurrent || item.isSwitchToEnabled ? USER_SWITCH_ENABLED_ALPHA

                            : USER_SWITCH_DISABLED_ALPHA);

                            : USER_SWITCH_DISABLED_ALPHA);

            convertView.setEnabled(item.isSwitchToEnabled);

            return convertView;

            return convertView;

        }

        }