commit 52eaebead4fd5f8a1cd85e22896398d600ab8f49
author Stefan Andonian <andonian@google.com> Thu Apr 07 18:53:45 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 07 18:53:45 2022 +0000
tree 919ebd18b862fe5eb08c61ce05b1657f6732106a
parent 44f9f67696484aa674b1a40ec171c66fab5a1da4
parent 253c23b2e82ee8d0b9412e1b80d13d5f0d5ea542

Merge "Close open folders when pausing launcher." into tm-dev

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 2636d55..6e86c43 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1189,6 +1189,7 @@
             mOverlayManager.onActivityResumed(this);
         }
 
+        AbstractFloatingView.closeOpenViews(this, false, TYPE_ALL & ~TYPE_REBIND_SAFE);
         TraceHelper.INSTANCE.endSection(traceToken);
     }
 
@@ -1692,9 +1693,6 @@
             outState.remove(RUNTIME_STATE_WIDGET_PANEL);
         }
 
-        // We close any open folders and shortcut containers that are not safe for rebind,
-        // and we need to make sure this state is reflected.
-        AbstractFloatingView.closeOpenViews(this, false, TYPE_ALL & ~TYPE_REBIND_SAFE);
         finishAutoCancelActionMode();
 
         if (mPendingRequestArgs != null) {