Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c247a00e authored by android-build-team Robot's avatar android-build-team Robot Committed by Android (Google) Code Review
Browse files

Merge "Fixes an issue where on resetup of the FloatingHeaderView it defaulted... 

Merge "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." into ub-launcher3-edmonton
parents 2f010177 1a637bee

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

+3 −1
Original line number Diff line number Diff line
@@ -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() {