From 1dcf5b2ef79b65274bfae92a34c46069a2ce455d Mon Sep 17 00:00:00 2001 From: fbaron Date: Wed, 21 Jun 2023 11:59:39 -0700 Subject: [PATCH] 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 --- .../com/android/launcher3/uioverrides/PredictedAppIcon.java | 2 +- src/com/android/launcher3/graphics/PreloadIconDrawable.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/quickstep/src/com/android/launcher3/uioverrides/PredictedAppIcon.java b/quickstep/src/com/android/launcher3/uioverrides/PredictedAppIcon.java index a8b7698b57..3e1d0f137a 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/PredictedAppIcon.java +++ b/quickstep/src/com/android/launcher3/uioverrides/PredictedAppIcon.java @@ -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) { diff --git a/src/com/android/launcher3/graphics/PreloadIconDrawable.java b/src/com/android/launcher3/graphics/PreloadIconDrawable.java index d366c4ae0d..2dd92a1d00 100644 --- a/src/com/android/launcher3/graphics/PreloadIconDrawable.java +++ b/src/com/android/launcher3/graphics/PreloadIconDrawable.java @@ -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