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

If device isn't on the keyguard, always use sfps blue colors

Browse Source 
These colors aren't themed so that they will match the edu videos. Make
SideFpsController robust against (mistake) asset color changes
to the lottie sfps_pulse.json and sfps_pulse_landscape.json files.

Test: all rotations for side fps
Fixes: 280430073
Fixes: 282617503
Change-Id: I0b3830a929ca1a83431aaff959bc62501973c6b3
This commit is contained in:
Beverly
2023-05-15 14:39:17 +00:00
committed by Beverly Tai
parent cc0f84d212
commit deabbbfa22
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/res/raw/sfps_pulse.json
View File

File diff suppressed because one or more lines are too long

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

@@ -20,6 +20,7 @@ import android.animation.AnimatorListenerAdapter
import android.app.ActivityTaskManager
import android.content.Context
import android.content.res.Configuration
import android.graphics.Color
import android.graphics.PixelFormat
import android.graphics.PorterDuff
import android.graphics.PorterDuffColorFilter
@@ -459,7 +460,12 @@ private fun LottieAnimationView.addOverlayDynamicColor(
addValueCallback(KeyPath(".black", "**"), LottieProperty.COLOR_FILTER) {
PorterDuffColorFilter(chevronFill, PorterDuff.Mode.SRC_ATOP)
}
} else if (isDarkMode(context)) {
} else {
if (!isDarkMode(context)) {
addValueCallback(KeyPath(".black", "**"), LottieProperty.COLOR_FILTER) {
PorterDuffColorFilter(Color.WHITE, PorterDuff.Mode.SRC_ATOP)
}
}
for (key in listOf(".blue600", ".blue400")) {
addValueCallback(KeyPath(key, "**"), LottieProperty.COLOR_FILTER) {
PorterDuffColorFilter(