| commit | 81aa250ff91ea46a5c56df9f9df5a7ccd24da981 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Apr 22 18:55:13 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 22 18:55:13 2021 +0000 |
| tree | 54fbe85596be8e277c08ce34015d8a49c9a4eb8a | |
| parent | aa66ec9227c03154b9a5fbe073a4e925171e831f [diff] | |
| parent | 2e17bbae0d67b3cd5673146505a63c6fa667a6a6 [diff] |
Merge "Fix cast exception when dropping widgets to a drop target" into sc-dev am: 2e17bbae0d Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14281909 Change-Id: Ic486ab77bca7b31848f30dc80034e08add392310
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 = () -> {