commit 2e17bbae0d67b3cd5673146505a63c6fa667a6a6
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Apr 22 18:08:26 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 22 18:08:26 2021 +0000
tree 22c768417264cfa668c50a5dad7ec9a094ea8e5f
parent 5a6e10bba84d4704c51ad4411d9d98f60623b458
parent cf93ef6cc9b647924cd468e1f6c2df7fad9cd74f

Merge "Fix cast exception when dropping widgets to a drop target" into sc-dev

src/com/android/launcher3/ButtonDropTarget.java

diff --git a/src/com/android/launcher3/ButtonDropTarget.java b/src/com/android/launcher3/ButtonDropTarget.java
index 7926862..a26217c 100644
--- a/src/com/android/launcher3/ButtonDropTarget.java
+++ b/src/com/android/launcher3/ButtonDropTarget.java
@@ -240,6 +240,7 @@
 
         final Rect to = getIconRect(d);
         final float scale = (float) to.width() / from.width();
+        d.dragView.detachContentView(/* reattachToPreviousParent= */ true);
         mDropTargetBar.deferOnDragEnd();
 
         Runnable onAnimationEndRunnable = () -> {