aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-01 00:06:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Don't move down all apps container when touching near scroll bar." into tm-qpr-dev am: 30c2bdda52

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22342811

Change-Id: If0e164e719229827e57d2edb34582ab8fd7bc88f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Andy Wickham
2023-03-31 23:25:05 +00:00
committed by Automerger Merge Worker
parent 7d8b81df09 30c2bdda52
commit c5f8dff8e2
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java
View File

@@ -353,16 +353,10 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext>
public boolean shouldContainerScroll(MotionEvent ev) {
BaseDragLayer dragLayer = mActivityContext.getDragLayer();
// IF the MotionEvent is inside the search box, and the container keeps on receiving
// touch input, container should move down.
if (dragLayer.isEventOverView(mSearchContainer, ev)) {
return true;
}
// Scroll if not within the container view (e.g. over large-screen scrim).
if (!dragLayer.isEventOverView(getVisibleContainerView(), ev)) {
return true;
}
if (dragLayer.isEventOverView(mBottomSheetHandleArea, ev)) {
// IF the MotionEvent is inside the search box or handle area, and the container keeps on
// receiving touch input, container should move down.
if (dragLayer.isEventOverView(mSearchContainer, ev)
|| dragLayer.isEventOverView(mBottomSheetHandleArea, ev)) {
return true;
}
AllAppsRecyclerView rv = getActiveRecyclerView();
@@ -374,6 +368,10 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext>
&& dragLayer.isEventOverView(rv.getScrollbar(), ev)) {
return false;
}
// Scroll if not within the container view (e.g. over large-screen scrim).
if (!dragLayer.isEventOverView(getVisibleContainerView(), ev)) {
return true;
}
return rv.shouldContainerScroll(ev, dragLayer);
}

1
src/com/android/launcher3/views/RecyclerViewFastScroller.java
View File

@@ -333,6 +333,7 @@ public class RecyclerViewFastScroller extends View {
}
}
@Override
public void onDraw(Canvas canvas) {
if (mThumbOffsetY < 0 || mRv == null) {
return;