diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-05-17 15:51:40 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-05-17 15:51:40 +0000 |
| commit | 48059dc7061b3144ba0b2f49d4ac4da7f7471752 (patch) | |
| tree | 666e4f16452a8e353dd8b67b3821706f10481cac /src/com/android/launcher3/allapps | |
| parent | 64d19820f6c3873604f6128a837456270d5f780e (diff) | |
| parent | d460c084eb4751436e7ebd9c3025defca7b236a3 (diff) | |
| download | android_packages_apps_Trebuchet-48059dc7061b3144ba0b2f49d4ac4da7f7471752.tar.gz android_packages_apps_Trebuchet-48059dc7061b3144ba0b2f49d4ac4da7f7471752.tar.bz2 android_packages_apps_Trebuchet-48059dc7061b3144ba0b2f49d4ac4da7f7471752.zip | |
Merge "Fixes a crash when turning off workprofile while the workprofile tab is active." into ub-launcher3-edmonton
Diffstat (limited to 'src/com/android/launcher3/allapps')
| -rw-r--r-- | src/com/android/launcher3/allapps/FloatingHeaderView.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/allapps/FloatingHeaderView.java b/src/com/android/launcher3/allapps/FloatingHeaderView.java index 5a66ccd38..462e7f34e 100644 --- a/src/com/android/launcher3/allapps/FloatingHeaderView.java +++ b/src/com/android/launcher3/allapps/FloatingHeaderView.java @@ -96,7 +96,7 @@ public class FloatingHeaderView extends LinearLayout implements mMainRV = setupRV(mMainRV, mAH[AllAppsContainerView.AdapterHolder.MAIN].recyclerView); mWorkRV = setupRV(mWorkRV, mAH[AllAppsContainerView.AdapterHolder.WORK].recyclerView); mParent = (ViewGroup) mMainRV.getParent(); - setMainActive(mMainRVActive); + setMainActive(mMainRVActive || mWorkRV == null); reset(false); } |