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

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

Change-Id: Ib527d0320c9606f5401029abe8e41eaf6b30e40f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java

@@ -358,16 +358,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
+        // IF the MotionEvent is inside the search box or handle area, and the container keeps on
-        // touch input, container should move down.
+        // receiving touch input, container should move down.
-        if (dragLayer.isEventOverView(mSearchContainer, ev)) {
+        if (dragLayer.isEventOverView(mSearchContainer, ev)
-            return true;
+                || dragLayer.isEventOverView(mBottomSheetHandleArea, ev)) {
-        }
-        // 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)) {
             return true;
         }
         AllAppsRecyclerView rv = getActiveRecyclerView();
@@ -379,6 +373,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);
     }
 

src/com/android/launcher3/views/RecyclerViewFastScroller.java

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