Merge "Update renamed util function M3HCTToColor in launcher code" into udc-dev-plus-aosp am: d8af5abcfd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23813693 Change-Id: I53dd898d0443dc1c596bec5ac475d73c28abced2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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) {
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user