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

Commit 1dcf5b2e authored by fbaron's avatar fbaron Committed by Cherrypicker Worker
Browse files

Update renamed util function M3HCTToColor in launcher code 

Bug: 288120001
Test: none
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:911be164b34224b503fbdd230beddf5046d0dabf)
Merged-In: If4c6783472d7fa05a1162e2f176a613d28f7bec3
Change-Id: If4c6783472d7fa05a1162e2f176a613d28f7bec3
parent af26e5d2

quickstep/src/com/android/launcher3/uioverrides/PredictedAppIcon.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -189,7 +189,7 @@ public class PredictedAppIcon extends DoubleShadowBubbleTextView { 
        } else {

        } else {

            float[] hctPlateColor = new float[3];

            float[] hctPlateColor = new float[3];

            ColorUtils.colorToM3HCT(mDotParams.appColor, hctPlateColor);

            ColorUtils.colorToM3HCT(mDotParams.appColor, hctPlateColor);

            newPlateColor = ColorUtils.M3HCTtoColor(hctPlateColor[0], 36, 85);

            newPlateColor = ColorUtils.M3HCTToColor(hctPlateColor[0], 36, 85);

        }

        }





        if (!animate) {

        if (!animate) {

src/com/android/launcher3/graphics/PreloadIconDrawable.java

+3 −3
Original line number Original line Diff line number Diff line
@@ -155,19 +155,19 @@ public class PreloadIconDrawable extends FastBitmapDrawable { 
        // Progress color

        // Progress color

        float[] m3HCT = new float[3];

        float[] m3HCT = new float[3];

        ColorUtils.colorToM3HCT(primaryIconColor, m3HCT);

        ColorUtils.colorToM3HCT(primaryIconColor, m3HCT);

        mProgressColor = ColorUtils.M3HCTtoColor(

        mProgressColor = ColorUtils.M3HCTToColor(

                m3HCT[0],

                m3HCT[0],

                m3HCT[1],

                m3HCT[1],

                isDarkMode ? Math.max(m3HCT[2], 55) : Math.min(m3HCT[2], 40));

                isDarkMode ? Math.max(m3HCT[2], 55) : Math.min(m3HCT[2], 40));





        // Track color

        // Track color

        mTrackColor = ColorUtils.M3HCTtoColor(

        mTrackColor = ColorUtils.M3HCTToColor(

                m3HCT[0],

                m3HCT[0],

                16,

                16,

                isDarkMode ? 30 : 90

                isDarkMode ? 30 : 90

        );

        );

        // Plate color

        // Plate color

        mPlateColor = ColorUtils.M3HCTtoColor(

        mPlateColor = ColorUtils.M3HCTToColor(

                m3HCT[0],

                m3HCT[0],

                isDarkMode ? 36 : 24,

                isDarkMode ? 36 : 24,

                isDarkMode ? (isThemed() ? 10 : 20) : 80

                isDarkMode ? (isThemed() ? 10 : 20) : 80