diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java index 37405dbaf1..211d98f8e6 100644 --- a/src/com/android/launcher3/allapps/AllAppsContainerView.java +++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java @@ -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) { diff --git a/src/com/android/launcher3/views/SpringRelativeLayout.java b/src/com/android/launcher3/views/SpringRelativeLayout.java index a508191730..598738b9f7 100644 --- a/src/com/android/launcher3/views/SpringRelativeLayout.java +++ b/src/com/android/launcher3/views/SpringRelativeLayout.java @@ -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();