commit 00d27d25dac241986145796e9bd3256b76e12995
author András Klöczl <andraskloczl@google.com> Wed Aug 10 08:07:30 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 10 08:07:30 2022 +0000
tree 3c86c0d12322f21fac0e668221836026d28c8c17
parent 89be3a4c6de3267151dd41336e4a6f8f62454a75
parent eb6a154230be51f039f1894818b97091a3d73639

Merge "Fix widget jump bug when moved to invalid place" into tm-qpr-dev

src/com/android/launcher3/Workspace.java

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 2bc5e64..4c9542d 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -2122,7 +2122,8 @@
                 final ItemInfo info = (ItemInfo) cell.getTag();
                 boolean isWidget = info.itemType == LauncherSettings.Favorites.ITEM_TYPE_APPWIDGET
                         || info.itemType == LauncherSettings.Favorites.ITEM_TYPE_CUSTOM_APPWIDGET;
-                if (isWidget) {
+                if (isWidget && dropTargetLayout != null) {
+                    // animate widget to a valid place
                     int animationType = resizeOnDrop ? ANIMATE_INTO_POSITION_AND_RESIZE :
                             ANIMATE_INTO_POSITION_AND_DISAPPEAR;
                     animateWidgetDrop(info, parent, d.dragView, null, animationType, cell, false);