From d84f771f75c0c220665f6dd98c34bd450a80f41c Mon Sep 17 00:00:00 2001 From: Hyunyoung Song Date: Wed, 21 Jun 2017 14:26:55 -0700 Subject: [PATCH] Do not apply legacy treatment on shortcuts Bug: 62617041 Change-Id: I56a04536fe1bcba9912c5da3ce5a9c9b75bc3506 --- src/com/android/launcher3/WidgetPreviewLoader.java | 2 +- src/com/android/launcher3/graphics/LauncherIcons.java | 3 +-- src/com/android/launcher3/widget/PendingItemDragHelper.java | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/com/android/launcher3/WidgetPreviewLoader.java b/src/com/android/launcher3/WidgetPreviewLoader.java index d421a0e4ce..758f52d9db 100644 --- a/src/com/android/launcher3/WidgetPreviewLoader.java +++ b/src/com/android/launcher3/WidgetPreviewLoader.java @@ -468,7 +468,7 @@ public class WidgetPreviewLoader { RectF boxRect = drawBoxWithShadow(c, size, size); Bitmap icon = LauncherIcons.createScaledBitmapWithoutShadow( - mutateOnMainThread(info.getFullResIcon(mIconCache)), mContext, Build.VERSION_CODES.O); + mutateOnMainThread(info.getFullResIcon(mIconCache)), mContext, 0); Rect src = new Rect(0, 0, icon.getWidth(), icon.getHeight()); boxRect.set(0, 0, iconSize, iconSize); diff --git a/src/com/android/launcher3/graphics/LauncherIcons.java b/src/com/android/launcher3/graphics/LauncherIcons.java index 19e5702476..466b5cb521 100644 --- a/src/com/android/launcher3/graphics/LauncherIcons.java +++ b/src/com/android/launcher3/graphics/LauncherIcons.java @@ -322,8 +322,7 @@ public class LauncherIcons { IconCache cache = app.getIconCache(); Bitmap unbadgedBitmap = unbadgedDrawable == null ? cache.getDefaultIcon(Process.myUserHandle()) - : LauncherIcons.createScaledBitmapWithoutShadow(unbadgedDrawable, context, - Build.VERSION_CODES.O); + : LauncherIcons.createScaledBitmapWithoutShadow(unbadgedDrawable, context, 0); if (!badged) { return unbadgedBitmap; diff --git a/src/com/android/launcher3/widget/PendingItemDragHelper.java b/src/com/android/launcher3/widget/PendingItemDragHelper.java index 6628971a59..19be28d832 100644 --- a/src/com/android/launcher3/widget/PendingItemDragHelper.java +++ b/src/com/android/launcher3/widget/PendingItemDragHelper.java @@ -116,7 +116,7 @@ public class PendingItemDragHelper extends DragPreviewProvider { } else { PendingAddShortcutInfo createShortcutInfo = (PendingAddShortcutInfo) mAddInfo; Drawable icon = createShortcutInfo.activityInfo.getFullResIcon(app.getIconCache()); - preview = LauncherIcons.createScaledBitmapWithoutShadow(icon, launcher, Build.VERSION_CODES.O); + preview = LauncherIcons.createScaledBitmapWithoutShadow(icon, launcher, 0); mAddInfo.spanX = mAddInfo.spanY = 1; scale = ((float) launcher.getDeviceProfile().iconSizePx) / preview.getWidth();