Merge "Update renamed util function M3HCTToColor in launcher code" into aosp-main-future

This commit is contained in:
Anvesh Renikindi
2023-09-29 15:46:58 +00:00
committed by Android (Google) Code Review
2 changed files with 4 additions and 4 deletions

View File

@@ -189,7 +189,7 @@ public class PredictedAppIcon extends DoubleShadowBubbleTextView {
} else {
float[] hctPlateColor = new float[3];
ColorUtils.colorToM3HCT(mDotParams.appColor, hctPlateColor);
newPlateColor = ColorUtils.M3HCTtoColor(hctPlateColor[0], 36, 85);
newPlateColor = ColorUtils.M3HCTToColor(hctPlateColor[0], 36, 85);
}
if (!animate) {

View File

@@ -155,19 +155,19 @@ public class PreloadIconDrawable extends FastBitmapDrawable {
// Progress color
float[] m3HCT = new float[3];
ColorUtils.colorToM3HCT(primaryIconColor, m3HCT);
mProgressColor = ColorUtils.M3HCTtoColor(
mProgressColor = ColorUtils.M3HCTToColor(
m3HCT[0],
m3HCT[1],
isDarkMode ? Math.max(m3HCT[2], 55) : Math.min(m3HCT[2], 40));
// Track color
mTrackColor = ColorUtils.M3HCTtoColor(
mTrackColor = ColorUtils.M3HCTToColor(
m3HCT[0],
16,
isDarkMode ? 30 : 90
);
// Plate color
mPlateColor = ColorUtils.M3HCTtoColor(
mPlateColor = ColorUtils.M3HCTToColor(
m3HCT[0],
isDarkMode ? 36 : 24,
isDarkMode ? (isThemed() ? 10 : 20) : 80