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

Commit 764c21b2 authored by Andy Wickham's avatar Andy Wickham
Browse files

Don't return early if searching during rebindAdapters(). 

This was a rare case (made less rare by rocket gesture) which was
not actually updating the UI correctly.

Expected flow:
 1. All Apps is inflated with a single recyclerview for apps (as
    defined in xml).
 2. Later, rebindAdapters() is called, and if there are work apps,
    the recyclerview is removed and replaced by a viewpager with 2
    children recyclerviews (one for personal and one for work).
 3. At any point if you start searching, the app rv or viewpager
    is hidden and the search rv is shown.

Actual flow in the error case:
 - Same as above, but if you were searching when 2 happens, we
   returned early, so we never replaced the app rv with the
   viewpager, so all the apps were dumped in the single rv, and
   the header with tabs showed above it.

Fix: 272575605
Test: Manually force first rebind ta happen while searching, and
verify this bug was hit before the fix but not after.

Change-Id: I25b8991564645368840a390733aa893dee4cd10e
parent 9529f08b

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

+25 −13
Original line number Diff line number Diff line
@@ -380,7 +380,23 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext> 
        return rv.shouldContainerScroll(ev, dragLayer);

    }



    /**

     * Resets the UI to be ready for fresh interactions in the future. Exits search and returns to

     * A-Z apps list.

     *

     * @param animate Whether to animate the header during the reset (e.g. switching profile tabs).

     **/

    public void reset(boolean animate) {

        reset(animate, true);

    }



    /**

     * Resets the UI to be ready for fresh interactions in the future.

     *

     * @param animate Whether to animate the header during the reset (e.g. switching profile tabs).

     * @param exitSearch Whether to force exit the search state and return to A-Z apps list.

     **/

    public void reset(boolean animate, boolean exitSearch) {

        for (int i = 0; i < mAH.size(); i++) {

            if (mAH.get(i).mRecyclerView != null) {

                mAH.get(i).mRecyclerView.scrollToTop();
@@ -394,11 +410,13 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext> 
        }

        // Reset the base recycler view after transitioning home.

        updateHeaderScroll(0);

        if (exitSearch) {

            // Reset the search bar after transitioning home.

            mSearchUiManager.resetSearch();

            // Animate to A-Z with 0 time to reset the animation with proper state management.

            animateToSearchState(false, 0);

        }

    }



    @Override

    public boolean dispatchKeyEvent(KeyEvent event) {
@@ -441,7 +459,7 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext> 
        }

        // Header keeps track of active recycler view to properly render header protection.

        mHeader.setActiveRV(currentActivePage);

        reset(true /* animate */);

        reset(true /* animate */, !isSearching() /* exitSearch */);



        mWorkManager.onActivePageChanged(currentActivePage);

    }
@@ -462,12 +480,6 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext> 
            return;

        }



        if (isSearching()) {

            mUsingTabs = showTabs;

            mWorkManager.detachWorkModeSwitch();

            return;

        }



        if (!FeatureFlags.ENABLE_SEARCH_RESULT_BACKGROUND_DRAWABLES.get()) {

            RecyclerView.ItemDecoration decoration = getMainAdapterProvider().getDecorator();

            getSearchRecyclerView().removeItemDecoration(decoration);
@@ -532,7 +544,7 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext> 
        mAllAppsStore.registerIconContainer(mAH.get(AdapterHolder.SEARCH).mRecyclerView);

    }



    protected View replaceAppsRVContainer(boolean showTabs) {

    private void replaceAppsRVContainer(boolean showTabs) {

        for (int i = AdapterHolder.MAIN; i <= AdapterHolder.WORK; i++) {

            AdapterHolder adapterHolder = mAH.get(i);

            if (adapterHolder.mRecyclerView != null) {
@@ -586,7 +598,7 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext> 
            layoutBelowSearchContainer(getSearchRecyclerView(), /* tabs= */ false);

        }



        return rvContainer;

        updateSearchResultsVisibility();

    }



    void setupHeader() {

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

+0 −1
Original line number Diff line number Diff line
@@ -521,7 +521,6 @@ public class AllAppsTransitionController 
     */

    private void onProgressAnimationEnd() {

        if (Float.compare(mProgress, 1f) == 0) {

            mAppsView.reset(false /* animate */);

            if (mShouldControlKeyboard) {

                mLauncher.getAppsView().getSearchUiManager().getEditText().hideKeyboard();

            }

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

+7 −1
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ public class FloatingHeaderView extends LinearLayout implements 
        updateExpectedHeight();



        mTabsHidden = tabsHidden;

        mTabLayout.setVisibility(tabsHidden ? View.GONE : View.VISIBLE);

        maybeSetTabVisibility(VISIBLE);

        mMainRV = mainRV;

        mWorkRV = workRV;

        mSearchRV = searchRV;
@@ -250,6 +250,12 @@ public class FloatingHeaderView extends LinearLayout implements 
                rvType == AdapterHolder.MAIN ? mMainRV

                : rvType == AdapterHolder.WORK ? mWorkRV : mSearchRV;

        mCurrentRV.addOnScrollListener(mOnScrollListener);

        maybeSetTabVisibility(rvType == AdapterHolder.SEARCH ? GONE : VISIBLE);

    }



    /** Update tab visibility to the given state, only if tabs are active (work profile exists). */

    void maybeSetTabVisibility(int visibility) {

        mTabLayout.setVisibility(mTabsHidden ? GONE : visibility);

    }



    private void updateExpectedHeight() {

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

+1 −0
Original line number Diff line number Diff line
@@ -125,6 +125,7 @@ public class SearchTransitionController { 


        mAllAppsContainerView.getFloatingHeaderView().setFloatingRowsCollapsed(true);

        mAllAppsContainerView.getFloatingHeaderView().setVisibility(VISIBLE);

        mAllAppsContainerView.getFloatingHeaderView().maybeSetTabVisibility(VISIBLE);

        mAllAppsContainerView.getAppsRecyclerViewContainer().setVisibility(VISIBLE);

        getSearchRecyclerView().setVisibility(VISIBLE);

        getSearchRecyclerView().setChildAttachedConsumer(this::onSearchChildAttached);