commit a8b3870603cebd59413615d61075f3e4a903f46b
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jun 09 01:26:29 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jun 09 01:26:29 2021 +0000
tree bebf3a40990bb553a2049617b999753d282250a9
parent 09a715b56735e533ad4beb6d4d690729750d2407
parent 7b4e042824b5f174bc4a545dbc72dc5af2430857

Merge "[AA+] Reset search manager when exiting all apps." into sc-dev am: e57006fe63 am: 285c50740a am: 7b4e042824

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14804874

Change-Id: I25a8601efaf46d279b6f4b0cb8f7ae743ec7b5b4

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 67002c4..eefa8c9 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1076,9 +1076,10 @@
             getRotationHelper().setCurrentStateRequest(REQUEST_NONE);
         }
 
-        if (mPrevLauncherState != state && !ALL_APPS.equals(state)
+        if (ALL_APPS.equals(mPrevLauncherState) && !ALL_APPS.equals(state)
                 // Making sure mAllAppsSessionLogId is not null to avoid double logging.
                 && mAllAppsSessionLogId != null) {
+            getAppsView().getSearchUiManager().resetSearch();
             getStatsLogManager().logger().log(LAUNCHER_ALLAPPS_EXIT);
             mAllAppsSessionLogId = null;
         }