diff options
| author | Hyunyoung Song <hyunyoungs@google.com> | 2017-06-21 14:26:55 -0700 |
|---|---|---|
| committer | Hyunyoung Song <hyunyoungs@google.com> | 2017-06-22 11:49:33 -0700 |
| commit | d84f771f75c0c220665f6dd98c34bd450a80f41c (patch) | |
| tree | 3e6b0f71eef4c747e01b02f82f34bb1f494996aa | |
| parent | 5a1ca5756ecea6784743f5cd1540844c1a83b36f (diff) | |
| download | android_packages_apps_Trebuchet-d84f771f75c0c220665f6dd98c34bd450a80f41c.tar.gz android_packages_apps_Trebuchet-d84f771f75c0c220665f6dd98c34bd450a80f41c.tar.bz2 android_packages_apps_Trebuchet-d84f771f75c0c220665f6dd98c34bd450a80f41c.zip | |
Do not apply legacy treatment on shortcuts
Bug: 62617041
Change-Id: I56a04536fe1bcba9912c5da3ce5a9c9b75bc3506
| -rw-r--r-- | src/com/android/launcher3/WidgetPreviewLoader.java | 2 | ||||
| -rw-r--r-- | src/com/android/launcher3/graphics/LauncherIcons.java | 3 | ||||
| -rw-r--r-- | 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 d421a0e4c..758f52d9d 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 19e570247..466b5cb52 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 6628971a5..19be28d83 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(); |