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

Merge "Match SFPS Keyguard color to the bouncer secondary color" into tm-qpr-dev

Browse Source
This commit is contained in:
Beverly Tai
2023-03-20 14:18:27 +00:00
committed by Android (Google) Code Review
parent 02b2a06f20 38c21b2be2
commit 106aa99da2
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/SystemUI/src/com/android/systemui/biometrics/SideFpsController.kt
View File

@@ -195,7 +195,7 @@ constructor(
scope.launch { scope.launch {
alternateBouncerInteractor.isVisible.collect { isVisible: Boolean -> alternateBouncerInteractor.isVisible.collect { isVisible: Boolean ->
if (isVisible) { if (isVisible) {
show(SideFpsUiRequestSource.ALTERNATE_BOUNCER) show(SideFpsUiRequestSource.ALTERNATE_BOUNCER, REASON_AUTH_KEYGUARD)
} else { } else {
hide(SideFpsUiRequestSource.ALTERNATE_BOUNCER) hide(SideFpsUiRequestSource.ALTERNATE_BOUNCER)
} }
@@ -436,13 +436,17 @@ private fun LottieAnimationView.addOverlayDynamicColor(
@BiometricOverlayConstants.ShowReason reason: Int @BiometricOverlayConstants.ShowReason reason: Int
) { ) {
fun update() { fun update() {
val c = context.getColor(R.color.biometric_dialog_accent)
val chevronFill = context.getColor(R.color.sfps_chevron_fill)
val isKeyguard = reason == REASON_AUTH_KEYGUARD val isKeyguard = reason == REASON_AUTH_KEYGUARD
if (isKeyguard) { if (isKeyguard) {
val color = context.getColor(R.color.numpad_key_color_secondary) // match bouncer color
val chevronFill =
com.android.settingslib.Utils.getColorAttrDefaultColor(
context,
android.R.attr.textColorPrimaryInverse
)
for (key in listOf(".blue600", ".blue400")) { for (key in listOf(".blue600", ".blue400")) {
addValueCallback(KeyPath(key, "**"), LottieProperty.COLOR_FILTER) { addValueCallback(KeyPath(key, "**"), LottieProperty.COLOR_FILTER) {
PorterDuffColorFilter(c, PorterDuff.Mode.SRC_ATOP) PorterDuffColorFilter(color, PorterDuff.Mode.SRC_ATOP)
} }
} }
addValueCallback(KeyPath(".black", "**"), LottieProperty.COLOR_FILTER) { addValueCallback(KeyPath(".black", "**"), LottieProperty.COLOR_FILTER) {