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

Commit 0d2c6c23 authored by Jonathan Miranda's avatar Jonathan Miranda Committed by Android (Google) Code Review
Browse files

Merge "Fix bug where QSB gets clipped when flinging All Apps open." into... 

Merge "Fix bug where QSB gets clipped when flinging All Apps open." into ub-launcher3-edmonton-polish
parents f37cfa72 3c71c6a5

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

+2 −1
Original line number Diff line number Diff line
@@ -314,7 +314,8 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo 


    @Override

    public int getCanvasClipTopForOverscroll() {

        return mHeader.getTop();

        // Do not clip if the QSB is attached to the spring, otherwise the QSB will get clipped.

        return mSpringViews.get(getSearchView().getId()) ? 0 : mHeader.getTop();

    }



    private void rebindAdapters(boolean showTabs) {

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

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ public class SpringRelativeLayout extends RelativeLayout { 
                }

            };



    private final SparseBooleanArray mSpringViews = new SparseBooleanArray();

    protected final SparseBooleanArray mSpringViews = new SparseBooleanArray();

    private final SpringAnimation mSpring;



    private float mDampedScrollShift = 0;