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

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

Merge "Bound overscroll shift amount to avoid content from drawing on top... 

Merge "Bound overscroll shift amount to avoid content from drawing on top (Y-val) of the QSB." into ub-launcher3-edmonton
parents 3adb0b9f 59167092

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

+8 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ import com.android.launcher3.InsettableFrameLayout; 
import com.android.launcher3.ItemInfo;

import com.android.launcher3.Launcher;

import com.android.launcher3.R;

import com.android.launcher3.Utilities;

import com.android.launcher3.config.FeatureFlags;

import com.android.launcher3.uioverrides.AllAppsScrim;

import com.android.launcher3.keyboard.FocusedItemDecorator;
@@ -121,6 +122,13 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo 
        return mAllAppsStore;

    }



    @Override

    protected void setDampedScrollShift(float shift) {

        // Bound the shift amount to avoid content from drawing on top (Y-val) of the QSB.

        float maxShift = getSearchView().getHeight() / 2f;

        super.setDampedScrollShift(Utilities.boundToRange(shift, -maxShift, maxShift));

    }



    @Override

    public void onDeviceProfileChanged(DeviceProfile dp) {

        for (AdapterHolder holder : mAH) {

src/com/android/launcher3/views/SpringRelativeLayout.java

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ public class SpringRelativeLayout extends RelativeLayout { 
        mActiveEdge = edge;

    }



    private void setDampedScrollShift(float shift) {

    protected void setDampedScrollShift(float shift) {

        if (shift != mDampedScrollShift) {

            mDampedScrollShift = shift;

            invalidate();