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

Commit db03f06c authored by Lucas Dupin's avatar Lucas Dupin Committed by android-build-team Robot
Browse files

Turn default gradient into solid black 

Test: visual
Bug: 66957450
Change-Id: I6a34a35912e4dd4594565f88636ce89689d26f2f
(cherry picked from commit e7476add)
(cherry picked from commit 12dad0c4)
parent e3715069

core/java/com/android/internal/colorextraction/types/Tonal.java

+5 −3
Original line number Diff line number Diff line
@@ -51,9 +51,11 @@ public class Tonal implements ExtractionType { 


    private static final boolean DEBUG = true;



    public static final int THRESHOLD_COLOR_LIGHT = 0xffe0e0e0;

    public static final int MAIN_COLOR_LIGHT = 0xffe0e0e0;

    public static final int SECONDARY_COLOR_LIGHT = 0xff9e9e9e;

    public static final int MAIN_COLOR_DARK = 0xff212121;

    public static final int THRESHOLD_COLOR_DARK = 0xff212121;

    public static final int MAIN_COLOR_DARK = 0xff000000;

    public static final int SECONDARY_COLOR_DARK = 0xff000000;



    private final TonalPalette mGreyPalette;
@@ -197,12 +199,12 @@ public class Tonal implements ExtractionType { 
        // light fallback or darker than our dark fallback.

        ColorUtils.colorToHSL(mainColor, mTmpHSL);

        final float mainLuminosity = mTmpHSL[2];

        ColorUtils.colorToHSL(MAIN_COLOR_LIGHT, mTmpHSL);

        ColorUtils.colorToHSL(THRESHOLD_COLOR_LIGHT, mTmpHSL);

        final float lightLuminosity = mTmpHSL[2];

        if (mainLuminosity > lightLuminosity) {

            return false;

        }

        ColorUtils.colorToHSL(MAIN_COLOR_DARK, mTmpHSL);

        ColorUtils.colorToHSL(THRESHOLD_COLOR_DARK, mTmpHSL);

        final float darkLuminosity = mTmpHSL[2];

        if (mainLuminosity < darkLuminosity) {

            return false;