From 5290d4895a28a82ba3d279236d39fb6fe209edf6 Mon Sep 17 00:00:00 2001 From: Charlie Anderson Date: Thu, 20 Mar 2025 17:26:45 -0400 Subject: Fixes folder changing size when going from ClipIconView to FolderIcon on closing app to folder Bug: 398080005 Test: manually closing apps to folder Flag: EXEMPT bug fix Change-Id: Ie0b087b71483833c2152d8a3c39b73a05fa3dd35 --- src/com/android/launcher3/dragndrop/FolderAdaptiveIcon.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'src') 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 -- cgit v1.2.3-59-g8ed1b