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

Merge "Update lockscreen shortcuts color tokens" into udc-dev am: 0d7340382a

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

Change-Id: I077c4dde5d96740875db3d992612aaad0cf46644
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Brad Hinegardner
2023-07-12 15:52:27 +00:00
committed by Automerger Merge Worker
parent 6ca41f39ff 0d7340382a
commit cb2ea52bea
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/res/drawable/keyguard_bottom_affordance_bg.xml
View File

@@ -20,7 +20,7 @@
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android" xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
android:shape="rectangle"> android:shape="rectangle">
<solid android:color="?androidprv:attr/colorSurface"/> <solid android:color="?androidprv:attr/materialColorSurfaceContainerHigh"/>
<size <size
android:width="@dimen/keyguard_affordance_fixed_width" android:width="@dimen/keyguard_affordance_fixed_width"
android:height="@dimen/keyguard_affordance_fixed_height"/> android:height="@dimen/keyguard_affordance_fixed_height"/>

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

@@ -377,9 +377,9 @@ object KeyguardBottomAreaViewBinder {
Utils.getColorAttrDefaultColor( Utils.getColorAttrDefaultColor(
view.context, view.context,
if (viewModel.isActivated) { if (viewModel.isActivated) {
com.android.internal.R.attr.textColorPrimaryInverse com.android.internal.R.attr.materialColorOnPrimaryFixed
} else { } else {
com.android.internal.R.attr.textColorPrimary com.android.internal.R.attr.materialColorOnSurface
}, },
) )
) )
@@ -389,9 +389,9 @@ object KeyguardBottomAreaViewBinder {
Utils.getColorAttr( Utils.getColorAttr(
view.context, view.context,
if (viewModel.isActivated) { if (viewModel.isActivated) {
com.android.internal.R.attr.colorAccentPrimary com.android.internal.R.attr.materialColorPrimaryFixed
} else { } else {
com.android.internal.R.attr.colorSurface com.android.internal.R.attr.materialColorSurfaceContainerHigh
} }
) )
} else { } else {