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

Commit 45d82cb8 authored by Aaron Liu's avatar Aaron Liu Committed by Automerger Merge Worker
Browse files

Merge "[Bouncer] Update color for userswitcher." into tm-qpr-dev am: 5c9e7793 am: c6165102 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20067974



Change-Id: I73fa3b638e56ca387703726cad4630aff4bf20c8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 504940d2 c6165102

packages/SystemUI/res-keyguard/drawable/bouncer_user_switcher_header_bg.xml

+2 −1
Original line number Diff line number Diff line
@@ -21,11 +21,12 @@ 
            android:paddingEnd="0dp">

    <item>

        <shape android:shape="rectangle">

          <solid android:color="?androidprv:attr/colorSurface" />

          <solid android:color="?androidprv:attr/colorSurfaceHighlight" />

            <corners android:radius="32dp" />

        </shape>

    </item>

    <item

        android:id="@+id/user_switcher_key_down"

        android:drawable="@drawable/ic_ksh_key_down"

        android:gravity="end|center_vertical"

        android:width="32dp"

packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java

+5 −0
Original line number Diff line number Diff line
@@ -1073,6 +1073,11 @@ public class KeyguardSecurityContainer extends FrameLayout { 
                        android.R.attr.textColorPrimary));

                header.setBackground(mView.getContext().getDrawable(

                        R.drawable.bouncer_user_switcher_header_bg));

                Drawable keyDownDrawable =

                        ((LayerDrawable) header.getBackground().mutate()).findDrawableByLayerId(

                                R.id.user_switcher_key_down);

                keyDownDrawable.setTintList(Utils.getColorAttr(mView.getContext(),

                        android.R.attr.textColorPrimary));

            }

        }