Merge changes from topic "am-4125e029-a507-49e6-9a52-cae6abb2d37d" into ub-launcher3-master
* changes:
[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
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.
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() {