Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Updating icon loader method calls as per signature change" into tm-qpr-dev

Browse Source
This commit is contained in:
Sunny Goyal
2022-10-21 18:27:47 +00:00
committed by Android (Google) Code Review
parent daa7365e9b d60ae092bb
commit 1cc345ab19
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleBadgeIconFactory.java
View File

@@ -52,7 +52,7 @@ public class BubbleBadgeIconFactory extends BaseIconFactory {
userBadgedAppIcon = new CircularRingDrawable(userBadgedAppIcon); userBadgedAppIcon = new CircularRingDrawable(userBadgedAppIcon);
} }
Bitmap userBadgedBitmap = createIconBitmap( Bitmap userBadgedBitmap = createIconBitmap(
userBadgedAppIcon, 1, BITMAP_GENERATION_MODE_WITH_SHADOW); userBadgedAppIcon, 1, MODE_WITH_SHADOW);
return createIconBitmap(userBadgedBitmap); return createIconBitmap(userBadgedBitmap);
} }

2
libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleIconFactory.java
View File

@@ -79,6 +79,6 @@ public class BubbleIconFactory extends BaseIconFactory {
true /* shrinkNonAdaptiveIcons */, true /* shrinkNonAdaptiveIcons */,
null /* outscale */, null /* outscale */,
outScale); outScale);
return createIconBitmap(icon, outScale[0], BITMAP_GENERATION_MODE_WITH_SHADOW); return createIconBitmap(icon, outScale[0], MODE_WITH_SHADOW);
} }
} }

3
libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/SplashscreenContentDrawer.java
View File

@@ -432,7 +432,8 @@ public class SplashscreenContentDrawer {
final ShapeIconFactory factory = new ShapeIconFactory( final ShapeIconFactory factory = new ShapeIconFactory(
SplashscreenContentDrawer.this.mContext, SplashscreenContentDrawer.this.mContext,
scaledIconDpi, mFinalIconSize); scaledIconDpi, mFinalIconSize);
final Bitmap bitmap = factory.createScaledBitmapWithoutShadow(iconDrawable); final Bitmap bitmap = factory.createScaledBitmap(iconDrawable,
BaseIconFactory.MODE_DEFAULT);
Trace.traceEnd(TRACE_TAG_WINDOW_MANAGER); Trace.traceEnd(TRACE_TAG_WINDOW_MANAGER);
createIconDrawable(new BitmapDrawable(bitmap), true, createIconDrawable(new BitmapDrawable(bitmap), true,
mHighResIconProvider.mLoadInDetail); mHighResIconProvider.mLoadInDetail);