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

am: 8474ab2b9d Change-Id: If1274e88a7cac6c097c8c34bef5e73b2676dcac7
2019-06-04 17:54:10 -07:00
parent 05bfac35af 8474ab2b9d
commit cbbc48b894
1 changed files with 3 additions and 2 deletions
@@ -625,15 +625,16 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo

    @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;
    }
 }