From 1a637bee188aadb4283f1d5fa255c39b7a9fd2f3 Mon Sep 17 00:00:00 2001
From: Mario Bertschler <bmario@google.com>
Date: Mon, 7 May 2018 20:43:11 +0200
Subject: [PATCH] Fixes an issue where on resetup of the FloatingHeaderView it
 defaulted to the main recyclerview even when the work recyclerview was active
 which resulted in the recyclerview not responding to scroll changes.

Bug: 72426657
Change-Id: I13c43137d69cd73ff7bdfe641f564f18f8443595
---
 src/com/android/launcher3/allapps/FloatingHeaderView.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/allapps/FloatingHeaderView.java b/src/com/android/launcher3/allapps/FloatingHeaderView.java
index 378450e76a..5a66ccd386 100644
--- a/src/com/android/launcher3/allapps/FloatingHeaderView.java
+++ b/src/com/android/launcher3/allapps/FloatingHeaderView.java
@@ -74,6 +74,7 @@ public class FloatingHeaderView extends LinearLayout implements
 
     protected boolean mTabsHidden;
     protected int mMaxTranslation;
+    private boolean mMainRVActive = true;
 
     public FloatingHeaderView(@NonNull Context context) {
         this(context, null);
@@ -95,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(true);
+        setMainActive(mMainRVActive);
         reset(false);
     }
 
@@ -108,6 +109,7 @@ public class FloatingHeaderView extends LinearLayout implements
 
     public void setMainActive(boolean active) {
         mCurrentRV = active ? mMainRV : mWorkRV;
+        mMainRVActive = active;
     }
 
     public int getMaxTranslation() {