aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-20 11:18:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Updating Drawables as per GraphicsUtils changes" into tm-qpr-dev am: c424941565

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21354885

Change-Id: I0835da6900b78fedd05542c1c5a4ea256e5ae74d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Sunny Goyal
2023-02-10 17:11:51 +00:00
committed by Automerger Merge Worker
parent 0bba675ce5 c424941565
commit f8ac3c1b14
3 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
quickstep/src/com/android/launcher3/uioverrides/PredictedAppIcon.java
View File

@@ -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

9
src/com/android/launcher3/DeviceProfile.java
View File

@@ -578,15 +578,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;

19
src/com/android/launcher3/graphics/PreloadIconDrawable.java
View File

@@ -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);
}
}
}