commit b70e7d1c1cd957137f3d6c29d71f66d889e72a22
author Adam Cohen <adamcohen@google.com> Fri May 08 17:51:16 2020 -0700
committer Adam Cohen <adamcohen@google.com> Sat May 09 00:54:04 2020 +0000
tree 70b82cb4320af4131f2eda3f5aa165c961734394
parent c77bc45fa5ed294fcbbdebb040acc5cc26e99f5b

Fix animation for non-default grids when dragging icon from All Apps into a Folder

Test: manual

Change-Id: I72b84ead68c6e415c91dd2b801fc05654a97cd96

src/com/android/launcher3/folder/FolderIcon.java

diff --git a/src/com/android/launcher3/folder/FolderIcon.java b/src/com/android/launcher3/folder/FolderIcon.java
index 9a3b0a6..93208d4 100644
--- a/src/com/android/launcher3/folder/FolderIcon.java
+++ b/src/com/android/launcher3/folder/FolderIcon.java
@@ -53,6 +53,7 @@
 import com.android.launcher3.Reorderable;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.Workspace;
+import com.android.launcher3.allapps.AllAppsContainerView;
 import com.android.launcher3.anim.Interpolators;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.dot.FolderDotInfo;
@@ -385,6 +386,14 @@
             float finalAlpha = index < MAX_NUM_ITEMS_IN_PREVIEW ? 0.5f : 0f;
 
             float finalScale = scale * scaleRelativeToDragLayer;
+
+            // Account for potentially different icon sizes with non-default grid settings
+            if (d.dragSource instanceof AllAppsContainerView) {
+                DeviceProfile grid = mActivity.getDeviceProfile();
+                float containerScale = (1f * grid.iconSizePx / grid.allAppsIconSizePx);
+                finalScale *= containerScale;
+            }
+
             dragLayer.animateView(animateView, from, to, finalAlpha,
                     1, 1, finalScale, finalScale, DROP_IN_ANIMATION_DURATION,
                     Interpolators.DEACCEL_2, Interpolators.ACCEL_2,