commit 49141ccf2ed535a49c1402e34fec494fb7ec5fd9
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Feb 17 20:45:46 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 17 20:45:46 2022 +0000
tree 6bee3a61a6c8b64dcd1599c0d91bf08beedc206b
parent a2215455da55827947252942a71385b9077a67a4
parent baf1ef55abe488b382281afca611dbe7c0f800b3

Merge "Revert "Clear all DragView in onSaveInstanceState""

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index fcd147f..8fb2f53 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1682,8 +1682,6 @@
         AbstractFloatingView.closeOpenViews(this, false, TYPE_ALL & ~TYPE_REBIND_SAFE);
         finishAutoCancelActionMode();
 
-        DragView.removeAllViews(this);
-
         if (mPendingRequestArgs != null) {
             outState.putParcelable(RUNTIME_STATE_PENDING_REQUEST_ARGS, mPendingRequestArgs);
         }

src/com/android/launcher3/dragndrop/DragView.java

diff --git a/src/com/android/launcher3/dragndrop/DragView.java b/src/com/android/launcher3/dragndrop/DragView.java
index 8bfd774..b914ae2 100644
--- a/src/com/android/launcher3/dragndrop/DragView.java
+++ b/src/com/android/launcher3/dragndrop/DragView.java
@@ -565,19 +565,4 @@
         iv.setImageDrawable(drawable);
         return iv;
     }
-
-    /**
-     * Removes any stray DragView from the DragLayer.
-     */
-    public static void removeAllViews(ActivityContext activity) {
-        BaseDragLayer dragLayer = activity.getDragLayer();
-        // Iterate in reverse order. DragView is added later to the dragLayer,
-        // and will be one of the last views.
-        for (int i = dragLayer.getChildCount() - 1; i >= 0; i--) {
-            View child = dragLayer.getChildAt(i);
-            if (child instanceof DragView) {
-                dragLayer.removeView(child);
-            }
-        }
-    }
 }