commit ab6be31746aafae1cd75a755eab1592ccef5065a
author Adam Cohen <adamcohen@google.com> Sat Jul 06 13:24:59 2019 +0900
committer Adam Cohen <adamcohen@google.com> Sat Jul 06 04:27:49 2019 +0000
tree e5ac0ecb81fd5f4fd07c507cbd3b67794d861177
parent 70697e48a8e0c16a9d7c4231767a213cbaa9df47

Fix issue where can't interact with Workspace while App => Home is running

=> Regression from recent CL ag/8074890
=> Fix which scopes the change down to the RecentsView, but not all PagedViews

Bug 136733573

Change-Id: I0abaa61b2b132d8086dc3b2cb3e3e9c1f181b5f5

src/com/android/launcher3/PagedView.java

diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index 2eeb132..f8e4c9d 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -16,7 +16,6 @@
 
 package com.android.launcher3;
 
-import static com.android.launcher3.Utilities.shouldDisableGestures;
 import static com.android.launcher3.compat.AccessibilityManagerCompat.isAccessibilityEnabled;
 import static com.android.launcher3.compat.AccessibilityManagerCompat.isObservedEventType;
 import static com.android.launcher3.config.FeatureFlags.QUICKSTEP_SPRINGS;
@@ -847,7 +846,7 @@
          */
 
         // Skip touch handling if there are no pages to swipe
-        if (getChildCount() <= 0 || shouldDisableGestures(ev)) return false;
+        if (getChildCount() <= 0 || shouldBlockGestures(ev)) return false;
 
         acquireVelocityTrackerAndAddMovement(ev);
 
@@ -1092,10 +1091,14 @@
         mAllowOverScroll = enable;
     }
 
+    protected boolean shouldBlockGestures(MotionEvent ev) {
+        return false;
+    }
+
     @Override
     public boolean onTouchEvent(MotionEvent ev) {
         // Skip touch handling if there are no pages to swipe
-        if (getChildCount() <= 0 || shouldDisableGestures(ev)) return false;
+        if (getChildCount() <= 0 || shouldBlockGestures(ev)) return false;
 
         acquireVelocityTrackerAndAddMovement(ev);