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

Commit 0b2d171f authored by Android Build Merger (Role)'s avatar Android Build Merger (Role)
Browse files

[automerger] Bound overscroll shift amount to avoid content from drawing on... 

[automerger] Bound overscroll shift amount to avoid content from drawing on top (Y-val) of the QSB. am: 59167092

Change-Id: I180c72e1dc8a05488eeffc059dfcb2bc47d4c468
parents c57e34a9 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();