commit 8474ab2b9dfb05daf82f0afe3f05181a2e40b89c
author vadimt <vadimt@google.com> Tue Jun 04 17:51:24 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Jun 04 17:51:24 2019 -0700
tree 9550bfa47caa877d800f2787e63056c1cef6d1fe
parent 067bce7d8a5d106619492dd5c4a23a7be70fc1d3
parent 8789aa05a1b5af25c727814331ac126a3007c528

Merge "Fixing All Apps's getting stuck in a non-updating state" into ub-launcher3-qt-dev
am: 8789aa05a1

Change-Id: I583ea8c9e6920aa072fa29087c51ce817e6b9d63

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 053c570..0d43e21 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -625,15 +625,16 @@
 
     @Override
     public boolean dispatchTouchEvent(MotionEvent ev) {
+        final boolean result = super.dispatchTouchEvent(ev);
         switch (ev.getActionMasked()) {
             case MotionEvent.ACTION_DOWN:
-                mAllAppsStore.setDeferUpdates(true);
+                if (result) mAllAppsStore.setDeferUpdates(true);
                 break;
             case MotionEvent.ACTION_UP:
             case MotionEvent.ACTION_CANCEL:
                 mAllAppsStore.setDeferUpdates(false);
                 break;
         }
-        return super.dispatchTouchEvent(ev);
+        return result;
     }
 }