Merge "Fixes folder changing size when going from ClipIconView to FolderIcon on closing app to folder" into main

1 files changed, 4 insertions, 7 deletions

diff --git a/src/com/android/launcher3/dragndrop/FolderAdaptiveIcon.java b/src/com/android/launcher3/dragndrop/FolderAdaptiveIcon.java
index 929e52e1fc..813ed3ec7c 100644
--- a/src/com/android/launcher3/dragndrop/FolderAdaptiveIcon.java
+++ b/src/com/android/launcher3/dragndrop/FolderAdaptiveIcon.java
@@ -38,7 +38,6 @@ import androidx.annotation.Nullable;
 import androidx.annotation.UiThread;
 
 import com.android.launcher3.folder.FolderIcon;
-import com.android.launcher3.folder.PreviewBackground;
 import com.android.launcher3.icons.BitmapRenderer;
 import com.android.launcher3.util.Preconditions;
 import com.android.launcher3.views.ActivityContext;
@@ -143,7 +142,6 @@ public class FolderAdaptiveIcon extends AdaptiveIconDrawable {
         icon.getPreviewBounds(sTmpRect);
         final int previewSize = sTmpRect.width();
 
-        PreviewBackground bg = icon.getFolderBackground();
         final int margin = (size - previewSize) / 2;
         final float previewShiftX = -sTmpRect.left + margin;
         final float previewShiftY = -sTmpRect.top + margin;
@@ -162,11 +160,10 @@ public class FolderAdaptiveIcon extends AdaptiveIconDrawable {
         foregroundCanvas.restore();
 
         // Draw background
-        Paint backgroundPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
-        backgroundPaint.setColor(bg.getBgColor());
-        bg.drawShadow(backgroundCanvas);
-        backgroundCanvas.drawPaint(backgroundPaint);
-        bg.drawBackgroundStroke(backgroundCanvas);
+        backgroundCanvas.save();
+        backgroundCanvas.translate(previewShiftX, previewShiftY);
+        icon.getFolderBackground().drawBackground(backgroundCanvas);
+        backgroundCanvas.restore();
     }
 
     @Override