diff options
author | Jon Miranda <jonmiranda@google.com> | 2018-06-15 11:12:21 -0700 |
---|---|---|
committer | Jon Miranda <jonmiranda@google.com> | 2018-06-15 11:19:32 -0700 |
commit | 3c71c6a564004c70041e531ddea77f4f90f9edac (patch) | |
tree | 90fc0afada24a13856a206ea52fe949194647c36 /src | |
parent | ae7c6d12840264bad5d31933f743677a73c3f8fb (diff) | |
download | android_packages_apps_Trebuchet-3c71c6a564004c70041e531ddea77f4f90f9edac.tar.gz android_packages_apps_Trebuchet-3c71c6a564004c70041e531ddea77f4f90f9edac.tar.bz2 android_packages_apps_Trebuchet-3c71c6a564004c70041e531ddea77f4f90f9edac.zip |
Fix bug where QSB gets clipped when flinging All Apps open.
Bug: 77538324
Change-Id: I3e40346559fd3b7010d92d28e12efcf2d8581640
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/launcher3/allapps/AllAppsContainerView.java | 3 | ||||
-rw-r--r-- | src/com/android/launcher3/views/SpringRelativeLayout.java | 2 |
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; |