commit 2f768cb5d974b54773bf1b0c84f831bba800e5c6
author Mario Bertschler <bmario@google.com> Thu Nov 30 16:35:57 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Nov 30 16:35:57 2017 +0000
tree a375d2ef2f5969996d1a793fa219c940e9a14169
parent 8a63a587c0f4633016a58cac0422dfdf31e8f6ae
parent a4dedf426fe06ebc29fb49c30e04f376ef6b7be6

Merge "Fixes rebinding worktab layout vs single recycler view (on workprofile change)" into ub-launcher3-master

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

diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index 320d287..da4367f 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -85,6 +85,7 @@
     private InterceptingViewPager mViewPager;
     private ViewGroup mHeader;
     private FloatingHeaderHandler mFloatingHeaderHandler;
+    private TabsPagerAdapter mTabsPagerAdapter;
 
     private SpannableStringBuilder mSearchQueryBuilder = null;
 
@@ -436,7 +437,9 @@
             setupWorkProfileTabs();
             setupHeader();
         } else {
+            mTabsPagerAdapter = null;
             mAH[AdapterHolder.MAIN].setup(findViewById(R.id.apps_list_view), null);
+            mAH[AdapterHolder.WORK].recyclerView = null;
             if (FeatureFlags.ALL_APPS_PREDICTION_ROW_VIEW) {
                 setupHeader();
             } else {
@@ -479,8 +482,11 @@
     }
 
     private void setupWorkProfileTabs() {
+        if (mTabsPagerAdapter != null) {
+            return;
+        }
         final SlidingTabStrip tabs = findViewById(R.id.tabs);
-        mViewPager.setAdapter(new TabsPagerAdapter());
+        mViewPager.setAdapter(mTabsPagerAdapter = new TabsPagerAdapter());
         mViewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
 
             boolean mVisible = true;