openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[cleanup] Shadows should not be clipped on AdaptiveIconDrawable b/36702964 

am: 830cca665c

Change-Id: Ib2a0e622cd480dbfea2ce59adc8a82f98ef2dac3
This commit is contained in:
Hyunyoung Song 2017-04-06 16:40:44 +00:00 committed by android-build-merger
parent a3b60c97c6 830cca665c
commit 72bdf27a3a
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/com/android/launcher3/graphics/LauncherIcons.java
View File

@ -119,6 +119,10 @@ public class LauncherIcons {
}
}
Bitmap bitmap = createIconBitmap(icon, context, scale);
if (FeatureFlags.ADAPTIVE_ICON_SHADOW && Utilities.isAtLeastO() &&
icon instanceof AdaptiveIconDrawable) {
bitmap = ShadowGenerator.getInstance(context).recreateIcon(bitmap);
}
return badgeIconForUser(bitmap, user, context);
}
@ -201,7 +205,17 @@ public class LauncherIcons {
* Returns a bitmap suitable for the all apps view.
*/
public static Bitmap createIconBitmap(Drawable icon, Context context) {
return createIconBitmap(icon, context, 1.0f /* scale */);
float scale = 1f;
if (FeatureFlags.ADAPTIVE_ICON_SHADOW && Utilities.isAtLeastO() &&
icon instanceof AdaptiveIconDrawable) {
scale = ShadowGenerator.getScaleForBounds(new RectF(0, 0, 0, 0));
}
Bitmap bitmap = createIconBitmap(icon, context, scale);
if (FeatureFlags.ADAPTIVE_ICON_SHADOW && Utilities.isAtLeastO() &&
icon instanceof AdaptiveIconDrawable) {
bitmap = ShadowGenerator.getInstance(context).recreateIcon(bitmap);
}
return bitmap;
}
/**
@ -226,16 +240,6 @@ public class LauncherIcons {
}
}
Class iconClass = null;
if (FeatureFlags.ADAPTIVE_ICON_SHADOW && Utilities.isAtLeastO()) {
try {
iconClass = Class.forName("android.graphics.drawable.AdaptiveIconDrawable");
} catch (Exception e) {
}
}
if (iconClass != null && iconClass.isAssignableFrom(icon.getClass())) {
scale *= ShadowGenerator.getScaleForBounds(new RectF(0, 0, 0, 0));
}
int sourceWidth = icon.getIntrinsicWidth();
int sourceHeight = icon.getIntrinsicHeight();
if (sourceWidth > 0 && sourceHeight > 0) {
@ -269,9 +273,6 @@ public class LauncherIcons {
icon.setBounds(sOldBounds);
canvas.setBitmap(null);
if (iconClass != null && iconClass.isAssignableFrom(icon.getClass())) {
bitmap = ShadowGenerator.getInstance(context).recreateIcon(bitmap);
}
return bitmap;
}
}