Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6f9b4b7 authored by Holly Jiuyu Sun's avatar Holly Jiuyu Sun Committed by Android (Google) Code Review
Browse files

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

parents 860657a5 98d6a402

src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java

+2 −0
Original line number Diff line number Diff line
@@ -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

+5 −0
Original line number Diff line number Diff line
@@ -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

+5 −0
Original line number Diff line number Diff line
@@ -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();

}