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

Commit 1517fdd1 authored by Grace Cheng's avatar Grace Cheng Committed by Automerger Merge Worker
Browse files

Merge "Increase animation size and dialog width in BiometricPrompt, and change... 

Merge "Increase animation size and dialog width in BiometricPrompt, and change DT->LT color mapping for better visibility" into tm-qpr-dev am: 49fedfb0 am: 1a9fbfdf

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



Change-Id: I9dad496db9d3a06a8260a16b4ed8bbf70e2b7f55
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7bde8fca 1a9fbfdf

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

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
    <color name="settingslib_color_grey800">#3c4043</color>

    <color name="settingslib_color_grey700">#5f6368</color>

    <color name="settingslib_color_grey600">#80868b</color>

    <color name="settingslib_color_grey500">#9AA0A6</color>

    <color name="settingslib_color_grey400">#bdc1c6</color>

    <color name="settingslib_color_grey300">#dadce0</color>

    <color name="settingslib_color_grey200">#e8eaed</color>

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

+5 −2
Original line number Diff line number Diff line
@@ -40,10 +40,13 @@ public class LottieColorUtils { 
        HashMap<String, Integer> map = new HashMap<>();

        map.put(

                ".grey600",

                R.color.settingslib_color_grey300);

                R.color.settingslib_color_grey400);

        map.put(

                ".grey700",

                R.color.settingslib_color_grey500);

        map.put(

                ".grey800",

                R.color.settingslib_color_grey200);

                R.color.settingslib_color_grey300);

        map.put(

                ".grey900",

                R.color.settingslib_color_grey50);