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

Commit 4a661b75 authored by Brad Hinegardner's avatar Brad Hinegardner
Browse files

Update lockscreen shortcuts color tokens 

Use the proper colors for the lockscreen shortcuts

Fixes: 287072561
Fixes: 290316219
Test: manual - toggle shortcut on and off in light mode, verify correct colors
Test: manual - toggle shortcut on and off in dark mode, verify correct colors
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2e72e9467fd0be5819993bf23ba9decdb1f6c3df)
Merged-In: I17a5444d6c21b9a109b6c9a308d367a4503f5fdc
Change-Id: I17a5444d6c21b9a109b6c9a308d367a4503f5fdc
parent d07b761b

packages/SystemUI/res/drawable/keyguard_bottom_affordance_bg.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

    android:shape="rectangle">

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

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

  <size

      android:width="@dimen/keyguard_affordance_fixed_width"

      android:height="@dimen/keyguard_affordance_fixed_height"/>

packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBottomAreaViewBinder.kt

+4 −4
Original line number Diff line number Diff line
@@ -377,9 +377,9 @@ object KeyguardBottomAreaViewBinder { 
            Utils.getColorAttrDefaultColor(

                view.context,

                if (viewModel.isActivated) {

                    com.android.internal.R.attr.textColorPrimaryInverse

                    com.android.internal.R.attr.materialColorOnPrimaryFixed

                } else {

                    com.android.internal.R.attr.textColorPrimary

                    com.android.internal.R.attr.materialColorOnSurface

                },

            )

        )
@@ -389,9 +389,9 @@ object KeyguardBottomAreaViewBinder { 
                Utils.getColorAttr(

                    view.context,

                    if (viewModel.isActivated) {

                        com.android.internal.R.attr.colorAccentPrimary

                        com.android.internal.R.attr.materialColorPrimaryFixed

                    } else {

                        com.android.internal.R.attr.colorSurface

                        com.android.internal.R.attr.materialColorSurfaceContainerHigh

                    }

                )

            } else {