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

Merge "If device isn't on the keyguard, always use sfps blue colors" into udc-dev

Browse Source
This commit is contained in:
Beverly Tai
2023-05-15 20:03:48 +00:00
committed by Android (Google) Code Review
parent 11cd46966d deabbbfa22
commit ee3ec01f81
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.app.ActivityTaskManager
import android.content.Context import android.content.Context
import android.content.res.Configuration import android.content.res.Configuration
import android.graphics.Color
import android.graphics.PixelFormat import android.graphics.PixelFormat
import android.graphics.PorterDuff import android.graphics.PorterDuff
import android.graphics.PorterDuffColorFilter import android.graphics.PorterDuffColorFilter
@@ -459,7 +460,12 @@ private fun LottieAnimationView.addOverlayDynamicColor(
addValueCallback(KeyPath(".black", "**"), LottieProperty.COLOR_FILTER) { addValueCallback(KeyPath(".black", "**"), LottieProperty.COLOR_FILTER) {
PorterDuffColorFilter(chevronFill, PorterDuff.Mode.SRC_ATOP) 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")) { for (key in listOf(".blue600", ".blue400")) {
addValueCallback(KeyPath(key, "**"), LottieProperty.COLOR_FILTER) { addValueCallback(KeyPath(key, "**"), LottieProperty.COLOR_FILTER) {
PorterDuffColorFilter( PorterDuffColorFilter(