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

Commit 1a78e1ab 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... 

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

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



Change-Id: I0012df5caf9ac27af30b3024a694882727b4f08f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a5ce21f7 1835c3ea

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(