commit 9c21bc071d603b2bfad840b56dfa4e87c9a6dba7
author Becky Qiu <xuqiu@google.com> Mon May 09 18:24:49 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 09 18:24:49 2022 +0000
tree 5fb6a5f47631544e1a26a96804de245bdf9c89f2
parent 787c0e135b3893953281b5d6d267e529a820d6f9
parent f0fd3d8e2ec49bb11596922e26ea436f1eb7e86d

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

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

diff --git a/src/com/android/launcher3/allapps/BaseAllAppsContainerView.java b/src/com/android/launcher3/allapps/BaseAllAppsContainerView.java
index 5bbc67e..72ca5a7 100644
--- a/src/com/android/launcher3/allapps/BaseAllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/BaseAllAppsContainerView.java
@@ -437,8 +437,12 @@
         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);