commit ba798772695fe27e46fbd31c5dde6e598f5e3764
author Adam Cohen <adamcohen@google.com> Wed May 22 16:14:31 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed May 22 16:14:31 2019 -0700
tree 4bf50286317736a0f0a0054bc22e269c74eb56f1
parent 1f152d01f88c50cc1573123c248000caa7b877c1
parent 05bba2f1f2d33ee176d5a9992622c2da830ba078

Fix issue where AllAppsContainerView was blocking touches to part of the home screen am: a09cfe2340
am: 05bba2f1f2

Change-Id: I073e9b34ab65bf36f3b7e41057345bb65bdca9ae

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

diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index 41252aa..63682c7 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -41,6 +41,7 @@
 import com.android.launcher3.InsettableFrameLayout;
 import com.android.launcher3.ItemInfo;
 import com.android.launcher3.Launcher;
+import com.android.launcher3.LauncherState;
 import com.android.launcher3.R;
 import com.android.launcher3.TestProtocol;
 import com.android.launcher3.Utilities;
@@ -193,11 +194,18 @@
 
     @Override
     public boolean onInterceptTouchEvent(MotionEvent ev) {
+
+        // The AllAppsContainerView houses the QSB and is hence visible from the Workspace
+        // Overview states. We shouldn't intercept for the scrubber in these cases.
+        if (!mLauncher.isInState(LauncherState.ALL_APPS)) return false;
+
         if (ev.getAction() == MotionEvent.ACTION_DOWN) {
             AllAppsRecyclerView rv = getActiveRecyclerView();
             if (rv != null &&
                     rv.getScrollbar().isHitInParent(ev.getX(), ev.getY(), mFastScrollerOffset)) {
                 mTouchHandler = rv.getScrollbar();
+            } else {
+                mTouchHandler = null;
             }
         }
         if (mTouchHandler != null) {