| commit | 63608f7821c47ab68430d141a56ef9cce6fddebb | [log] [tgz] |
|---|---|---|
| author | Becky Qiu <xuqiu@google.com> | Mon May 09 18:48:59 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon May 09 18:48:59 2022 +0000 |
| tree | 5fb6a5f47631544e1a26a96804de245bdf9c89f2 | |
| parent | bc681eb52789bfd7a498f5cc64878c5fb5225fe1 [diff] | |
| parent | 9c21bc071d603b2bfad840b56dfa4e87c9a6dba7 [diff] |
Merge "[Toast] Fix the NPE in isPersonalTab()." into tm-dev am: 9c21bc071d Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18206587 Change-Id: I6b09f7484164de9475758a562881557da832838c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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);