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

2 files changed, 3 insertions, 2 deletions

diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index 4d63c960a..fdf32af6d 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -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) {
diff --git a/src/com/android/launcher3/views/SpringRelativeLayout.java b/src/com/android/launcher3/views/SpringRelativeLayout.java
index 892c59f27..b0313ceab 100644
--- a/src/com/android/launcher3/views/SpringRelativeLayout.java
+++ b/src/com/android/launcher3/views/SpringRelativeLayout.java
@@ -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;