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

Commit dd6d5225 authored by Austin Delgado's avatar Austin Delgado Committed by Automerger Merge Worker
Browse files

Merge "Update light mode colors for Biometric Prompt UDFPS" into udc-d1-dev am: b42dd6f2 

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



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

packages/SettingsLib/IllustrationPreference/res/values/colors.xml

+2 −0
Original line number Diff line number Diff line
@@ -25,10 +25,12 @@ 
    <color name="settingslib_color_blue100">#d2e3fc</color>

    <color name="settingslib_color_blue50">#e8f0fe</color>

    <color name="settingslib_color_green600">#1e8e3e</color>

    <color name="settingslib_color_green500">#34A853</color>

    <color name="settingslib_color_green400">#5bb974</color>

    <color name="settingslib_color_green100">#ceead6</color>

    <color name="settingslib_color_green50">#e6f4ea</color>

    <color name="settingslib_color_red600">#d93025</color>

    <color name="settingslib_color_red500">#B3261E</color>

    <color name="settingslib_color_red400">#ee675c</color>

    <color name="settingslib_color_red100">#fad2cf</color>

    <color name="settingslib_color_red50">#fce8e6</color>

packages/SettingsLib/IllustrationPreference/src/com/android/settingslib/widget/LottieColorUtils.java

+6 −3
Original line number Diff line number Diff line
@@ -41,9 +41,6 @@ public class LottieColorUtils { 
        map.put(

                ".grey600",

                R.color.settingslib_color_grey400);

        map.put(

                ".grey700",

                R.color.settingslib_color_grey500);

        map.put(

                ".grey800",

                R.color.settingslib_color_grey300);
@@ -62,6 +59,12 @@ public class LottieColorUtils { 
        map.put(

                ".green400",

                R.color.settingslib_color_green600);

        map.put(

                ".green200",

                R.color.settingslib_color_green500);

        map.put(

                ".red200",

                R.color.settingslib_color_red500);

        DARK_TO_LIGHT_THEME_COLOR_MAP = Collections.unmodifiableMap(map);

    }

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

+1 −3
Original line number Diff line number Diff line
@@ -122,10 +122,8 @@ open class AuthBiometricFingerprintIconController( 
        if (shouldAnimateIconViewForTransition(lastState, newState)) {

            iconView.playAnimation()

        }

        if (isSideFps) {

        LottieColorUtils.applyDynamicColors(context, iconView)

    }

    }



    override fun updateIcon(@BiometricState lastState: Int, @BiometricState newState: Int) {

        if (isSideFps) {