diff options
| author | vadimt <vadimt@google.com> | 2019-06-04 17:51:24 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-04 17:51:24 -0700 |
| commit | 8474ab2b9dfb05daf82f0afe3f05181a2e40b89c (patch) | |
| tree | 9550bfa47caa877d800f2787e63056c1cef6d1fe /src | |
| parent | 067bce7d8a5d106619492dd5c4a23a7be70fc1d3 (diff) | |
| parent | 8789aa05a1b5af25c727814331ac126a3007c528 (diff) | |
| download | android_packages_apps_Trebuchet-8474ab2b9dfb05daf82f0afe3f05181a2e40b89c.tar.gz android_packages_apps_Trebuchet-8474ab2b9dfb05daf82f0afe3f05181a2e40b89c.tar.bz2 android_packages_apps_Trebuchet-8474ab2b9dfb05daf82f0afe3f05181a2e40b89c.zip | |
Merge "Fixing All Apps's getting stuck in a non-updating state" into ub-launcher3-qt-dev
am: 8789aa05a1
Change-Id: I583ea8c9e6920aa072fa29087c51ce817e6b9d63
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/allapps/AllAppsContainerView.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java index 053c57004..0d43e214e 100644 --- a/src/com/android/launcher3/allapps/AllAppsContainerView.java +++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java @@ -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; } } |