summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2019-04-30 19:29:14 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-04-30 19:29:14 +0000
commit943ce93bd5f542933d1dc75e5b78a1605b59bbee (patch)
tree02264c4e847b69d1087bf37cd800a0f3aa139b24 /src
parent2e6f3c73245f71c98a8a3228770acca96df971ec (diff)
parent2acea9f8722709a2ee0745e91235f0923644e5f0 (diff)
downloadandroid_packages_apps_Trebuchet-943ce93bd5f542933d1dc75e5b78a1605b59bbee.tar.gz
android_packages_apps_Trebuchet-943ce93bd5f542933d1dc75e5b78a1605b59bbee.tar.bz2
android_packages_apps_Trebuchet-943ce93bd5f542933d1dc75e5b78a1605b59bbee.zip
Merge "Enabling quick-switch gesture in landscape mode (2 button UI)" into ub-launcher3-qt-dev
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/PagedView.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index 3a02b073e..b6404301d 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -1088,10 +1088,8 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
@Override
public boolean onTouchEvent(MotionEvent ev) {
- super.onTouchEvent(ev);
-
// Skip touch handling if there are no pages to swipe
- if (getChildCount() <= 0) return super.onTouchEvent(ev);
+ if (getChildCount() <= 0) return false;
acquireVelocityTrackerAndAddMovement(ev);