commit 902620853017f3308e677853b13f5598e64c1c3f
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Mon May 07 18:43:38 2018 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> Mon May 07 18:43:38 2018 +0000
tree 08d603de4b07f406206bd6cbf0f07d3a3361c8af
parent 17588181b9b892eac60545fd625759a989352deb
parent 1a637bee188aadb4283f1d5fa255c39b7a9fd2f3

[automerger] 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. am: 1a637bee18

Change-Id: I35f4ddb56975fbc6daf76030c63aff91ba332e51

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

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