Merge "Clear the staled mFocusedView when toast surface is closed." into tm-qpr-dev

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();
         }

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;
+    }
 }

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();
 }