| commit | 1f21f417f416307bafdd47a3094b962e88b7760b | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | Fri Jun 15 18:19:52 2018 +0000 |
| committer | Android Build Merger (Role) <noreply-android-build-merger@google.com> | Fri Jun 15 18:19:52 2018 +0000 |
| tree | e983a89ee8c8acb2c3cb15f1b979e8081cb29a11 | |
| parent | 1cffc1a5ef0d678457225139daaf3e089c902c21 [diff] | |
| parent | 3c71c6a564004c70041e531ddea77f4f90f9edac [diff] |
[automerger] Fix bug where QSB gets clipped when flinging All Apps open. am: 3c71c6a564 Change-Id: Idb85d97d1253b253c180247f34f8c1631cea6bbf
diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java index 4d63c96..fdf32af 100644 --- a/src/com/android/launcher3/allapps/AllAppsContainerView.java +++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -314,7 +314,8 @@ @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 892c59f..b0313ce 100644 --- a/src/com/android/launcher3/views/SpringRelativeLayout.java +++ b/src/com/android/launcher3/views/SpringRelativeLayout.java
@@ -54,7 +54,7 @@ } }; - private final SparseBooleanArray mSpringViews = new SparseBooleanArray(); + protected final SparseBooleanArray mSpringViews = new SparseBooleanArray(); private final SpringAnimation mSpring; private float mDampedScrollShift = 0;