diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-06-04 16:37:58 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-06-04 16:37:58 +0000 |
commit | 8789aa05a1b5af25c727814331ac126a3007c528 (patch) | |
tree | 6a6fd9507b3ee7aadab85ebe735c8851651e8ded /src | |
parent | ce0c093133e324b15d2278a77f0c091a70ba3530 (diff) | |
parent | 3ca5280186aad28a47916ecbf52cead127bb40b7 (diff) | |
download | android_packages_apps_Trebuchet-8789aa05a1b5af25c727814331ac126a3007c528.tar.gz android_packages_apps_Trebuchet-8789aa05a1b5af25c727814331ac126a3007c528.tar.bz2 android_packages_apps_Trebuchet-8789aa05a1b5af25c727814331ac126a3007c528.zip |
Merge "Fixing All Apps's getting stuck in a non-updating state" into ub-launcher3-qt-dev
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; } } |