From 98d6a4027ae62e2a4b9801f017f7f40ea98988de Mon Sep 17 00:00:00 2001
From: Holly Sun <jiuyu@google.com>
Date: Wed, 14 Sep 2022 14:56:47 -0700
Subject: [PATCH] Clear the staled mFocusedView when toast surface is closed.

Test: manual
Bug: 224756660
Change-Id: Iadce94f9138ee375fa9b6e3ef8fb685847312045
---
 .../launcher3/allapps/ActivityAllAppsContainerView.java      | 2 ++
 .../allapps/search/DefaultSearchAdapterProvider.java         | 5 +++++
 .../launcher3/allapps/search/SearchAdapterProvider.java      | 5 +++++
 3 files changed, 12 insertions(+)

diff --git a/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java b/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java
index aa9cfd16f5..c1eaa16c9e 100644
--- a/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java
@@ -84,6 +84,7 @@ public class ActivityAllAppsContainerView<T extends Context & AppLauncher
 
     /** Invoke when the current search session is finished. */
     public void onClearSearchResult() {
+        getMainAdapterProvider().clearHighlightedItem();
         animateToSearchState(false);
         rebindAdapters();
     }
@@ -92,6 +93,7 @@ public class ActivityAllAppsContainerView<T extends Context & AppLauncher
      * Sets results list for search
      */
     public void setSearchResults(ArrayList<AdapterItem> results) {
+        getMainAdapterProvider().clearHighlightedItem();
         if (getSearchResultList().setSearchResults(results)) {
             getSearchRecyclerView().onSearchResultsChanged();
         }
diff --git a/src/com/android/launcher3/allapps/search/DefaultSearchAdapterProvider.java b/src/com/android/launcher3/allapps/search/DefaultSearchAdapterProvider.java
index a95bd514da..4fb732d5f0 100644
--- a/src/com/android/launcher3/allapps/search/DefaultSearchAdapterProvider.java
+++ b/src/com/android/launcher3/allapps/search/DefaultSearchAdapterProvider.java
@@ -84,4 +84,9 @@ public class DefaultSearchAdapterProvider extends SearchAdapterProvider<AppLaunc
     public RecyclerView.ItemDecoration getDecorator() {
         return mDecoration;
     }
+
+    @Override
+    public void clearHighlightedItem() {
+        mHighlightedView = null;
+    }
 }
diff --git a/src/com/android/launcher3/allapps/search/SearchAdapterProvider.java b/src/com/android/launcher3/allapps/search/SearchAdapterProvider.java
index bc52784caf..3890741d8e 100644
--- a/src/com/android/launcher3/allapps/search/SearchAdapterProvider.java
+++ b/src/com/android/launcher3/allapps/search/SearchAdapterProvider.java
@@ -58,4 +58,9 @@ public abstract class SearchAdapterProvider<T extends ActivityContext> extends B
      * Returns the item decorator.
      */
     public abstract RecyclerView.ItemDecoration getDecorator();
+
+    /**
+     * Clear the highlighted view.
+     */
+    public abstract void clearHighlightedItem();
 }