diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-02-13 00:58:43 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-02-13 00:58:43 +0000 |
commit | e9dc116725f4ad6a7cd369b683767952a6ce8ed0 (patch) | |
tree | 37ba1eb5544cf79aafd47399a5349b2ebeb7002d | |
parent | 78f22ce35da678b13562aa0fd439965b05c6b082 (diff) | |
parent | be8d409cc4aba572fe3d83aaf38d8f9e03eac91d (diff) | |
download | Launcher3-e9dc116725f4ad6a7cd369b683767952a6ce8ed0.tar.gz |
Merge cherrypicks of ['googleplex-android-review.googlesource.com/21354885'] into tm-d3-release.
Change-Id: I01580723cd245e5696c97ef39b2ef3fafeb9fdd8
3 files changed, 19 insertions, 11 deletions
diff --git a/quickstep/src/com/android/launcher3/uioverrides/PredictedAppIcon.java b/quickstep/src/com/android/launcher3/uioverrides/PredictedAppIcon.java index bf0f8f72e9..25207d4382 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/PredictedAppIcon.java +++ b/quickstep/src/com/android/launcher3/uioverrides/PredictedAppIcon.java @@ -124,7 +124,7 @@ public class PredictedAppIcon extends DoubleShadowBubbleTextView { int shadowSize = context.getResources().getDimensionPixelSize( R.dimen.blur_size_thin_outline); mShadowFilter = new BlurMaskFilter(shadowSize, BlurMaskFilter.Blur.OUTER); - mShapePath = GraphicsUtils.getShapePath(mNormalizedIconSize); + mShapePath = GraphicsUtils.getShapePath(context, mNormalizedIconSize); } @Override diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java index 0cefb7e666..e850ec68dc 100644 --- a/src/com/android/launcher3/DeviceProfile.java +++ b/src/com/android/launcher3/DeviceProfile.java @@ -577,15 +577,16 @@ public class DeviceProfile { dimensionOverrideProvider.accept(this); // This is done last, after iconSizePx is calculated above. - mDotRendererWorkSpace = createDotRenderer(iconSizePx, dotRendererCache); - mDotRendererAllApps = createDotRenderer(allAppsIconSizePx, dotRendererCache); + mDotRendererWorkSpace = createDotRenderer(context, iconSizePx, dotRendererCache); + mDotRendererAllApps = createDotRenderer(context, allAppsIconSizePx, dotRendererCache); } private static DotRenderer createDotRenderer( - int size, @NonNull SparseArray<DotRenderer> cache) { + @NonNull Context context, int size, @NonNull SparseArray<DotRenderer> cache) { DotRenderer renderer = cache.get(size); if (renderer == null) { - renderer = new DotRenderer(size, getShapePath(DEFAULT_DOT_SIZE), DEFAULT_DOT_SIZE); + renderer = new DotRenderer(size, getShapePath(context, DEFAULT_DOT_SIZE), + DEFAULT_DOT_SIZE); cache.put(size, renderer); } return renderer; diff --git a/src/com/android/launcher3/graphics/PreloadIconDrawable.java b/src/com/android/launcher3/graphics/PreloadIconDrawable.java index f2fde0e7dd..8efd12a917 100644 --- a/src/com/android/launcher3/graphics/PreloadIconDrawable.java +++ b/src/com/android/launcher3/graphics/PreloadIconDrawable.java @@ -138,7 +138,8 @@ public class PreloadIconDrawable extends FastBitmapDrawable { IconPalette.getPreloadProgressColor(context, info.bitmap.color), getPreloadColors(context), Utilities.isDarkTheme(context), - getRefreshRateMillis(context)); + getRefreshRateMillis(context), + GraphicsUtils.getShapePath(context, DEFAULT_PATH_SIZE)); } public PreloadIconDrawable( @@ -146,10 +147,11 @@ public class PreloadIconDrawable extends FastBitmapDrawable { int indicatorColor, int[] preloadColors, boolean isDarkMode, - int refreshRateMillis) { + int refreshRateMillis, + Path shapePath) { super(info.bitmap); mItem = info; - mShapePath = GraphicsUtils.getShapePath(DEFAULT_PATH_SIZE); + mShapePath = shapePath; mScaledTrackPath = new Path(); mScaledProgressPath = new Path(); @@ -386,7 +388,8 @@ public class PreloadIconDrawable extends FastBitmapDrawable { mIndicatorColor, new int[] {mSystemAccentColor, mSystemBackgroundColor}, mIsDarkMode, - mRefreshRateMillis); + mRefreshRateMillis, + mShapePath); } @Override @@ -442,6 +445,7 @@ public class PreloadIconDrawable extends FastBitmapDrawable { protected final boolean mIsDarkMode; protected final int mLevel; protected final int mRefreshRateMillis; + private final Path mShapePath; public PreloadIconConstantState( Bitmap bitmap, @@ -450,7 +454,8 @@ public class PreloadIconDrawable extends FastBitmapDrawable { int indicatorColor, int[] preloadColors, boolean isDarkMode, - int refreshRateMillis) { + int refreshRateMillis, + Path shapePath) { super(bitmap, iconColor); mInfo = info; mIndicatorColor = indicatorColor; @@ -458,6 +463,7 @@ public class PreloadIconDrawable extends FastBitmapDrawable { mIsDarkMode = isDarkMode; mLevel = info.getProgressLevel(); mRefreshRateMillis = refreshRateMillis; + mShapePath = shapePath; } @Override @@ -467,7 +473,8 @@ public class PreloadIconDrawable extends FastBitmapDrawable { mIndicatorColor, mPreloadColors, mIsDarkMode, - mRefreshRateMillis); + mRefreshRateMillis, + mShapePath); } } } |