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

Commit 93e3a15d authored by Beverly Tai's avatar Beverly Tai Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: Ifbfccbb5fe146b1c4362a9dc6833bdeceff7c1a3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bd9ff0b9 ee3ec01f

packages/SystemUI/res/raw/sfps_pulse.json

+1 −1

File changed.

Preview size limit exceeded, changes collapsed.

packages/SystemUI/src/com/android/systemui/biometrics/SideFpsController.kt

+7 −1
Original line number Diff line number Diff line
@@ -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(