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

Commit 63608f78 authored by Becky Qiu's avatar Becky Qiu Committed by Automerger Merge Worker
Browse files

Merge "[Toast] Fix the NPE in isPersonalTab()." into tm-dev am: 9c21bc07 

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



Change-Id: I6b09f7484164de9475758a562881557da832838c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bc681eb5 9c21bc07

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

+5 −1
Original line number Diff line number Diff line
@@ -437,8 +437,12 @@ public abstract class BaseAllAppsContainerView<T extends Context & ActivityConte 
        if (showTabs == mUsingTabs && !force) {

            return;

        }



        // replaceRVcontainer() needs to use both mUsingTabs value to remove the old view AND

        // showTabs value to create new view. Hence the mUsingTabs new value assignment MUST happen

        // after this call.

        replaceRVContainer(showTabs);

        mUsingTabs = showTabs;

        replaceRVContainer(mUsingTabs);



        mAllAppsStore.unregisterIconContainer(mAH.get(AdapterHolder.MAIN).mRecyclerView);

        mAllAppsStore.unregisterIconContainer(mAH.get(AdapterHolder.WORK).mRecyclerView);