Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3fede16f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Do not apply legacy treatment on shortcuts Bug: 62617041" into ub-launcher3-dorval-polish

parents f3b1c0f7 d84f771f

src/com/android/launcher3/WidgetPreviewLoader.java

+1 −1
Original line number Diff line number Diff line
@@ -471,7 +471,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);

src/com/android/launcher3/graphics/LauncherIcons.java

+1 −2
Original line number Diff line number Diff line
@@ -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;

src/com/android/launcher3/widget/PendingItemDragHelper.java

+1 −1
Original line number Diff line number Diff line
@@ -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();