diff options
| author | Hyunyoung Song <hyunyoungs@google.com> | 2017-04-27 11:43:47 -0700 |
|---|---|---|
| committer | Hyunyoung Song <hyunyoungs@google.com> | 2017-04-27 11:43:47 -0700 |
| commit | 09204172b33cf7fa88662f2871f872bf666822a4 (patch) | |
| tree | 6f1222331760dc5a743d606ebfdfc893bf2fa3a8 /src/com/android/launcher3/widget/PendingItemDragHelper.java | |
| parent | f73161b8835f2ad5d84f9f7844a10361895f0cc3 (diff) | |
| download | android_packages_apps_Trebuchet-09204172b33cf7fa88662f2871f872bf666822a4.tar.gz android_packages_apps_Trebuchet-09204172b33cf7fa88662f2871f872bf666822a4.tar.bz2 android_packages_apps_Trebuchet-09204172b33cf7fa88662f2871f872bf666822a4.zip | |
[MANUAL] resolve merge conflicts of 59c0e0e91 to ub-launcher3-dorval-polish
Change-Id: I7c80b665b5216e99284f5b04b8500fc35d916985
Diffstat (limited to 'src/com/android/launcher3/widget/PendingItemDragHelper.java')
| -rw-r--r-- | src/com/android/launcher3/widget/PendingItemDragHelper.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/launcher3/widget/PendingItemDragHelper.java b/src/com/android/launcher3/widget/PendingItemDragHelper.java index b4118790c..6628971a5 100644 --- a/src/com/android/launcher3/widget/PendingItemDragHelper.java +++ b/src/com/android/launcher3/widget/PendingItemDragHelper.java @@ -22,6 +22,7 @@ import android.graphics.Paint; import android.graphics.Point; import android.graphics.Rect; import android.graphics.drawable.Drawable; +import android.os.Build; import android.view.View; import android.widget.RemoteViews; @@ -115,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); + preview = LauncherIcons.createScaledBitmapWithoutShadow(icon, launcher, Build.VERSION_CODES.O); mAddInfo.spanX = mAddInfo.spanY = 1; scale = ((float) launcher.getDeviceProfile().iconSizePx) / preview.getWidth(); |