diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-08-23 18:40:40 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-08-23 18:40:40 +0000 |
commit | 2345e6cdc6aad5c5e6bc5caf810873e89405822f (patch) | |
tree | a0517d3f63b15081aff59b1fe472618112b970ca /src/com | |
parent | 1b8d309782f465b058408fa512f9f229c4629110 (diff) | |
parent | 59cba191c31b2aadc601732e4204a3209b46db65 (diff) | |
download | android_packages_apps_Trebuchet-2345e6cdc6aad5c5e6bc5caf810873e89405822f.tar.gz android_packages_apps_Trebuchet-2345e6cdc6aad5c5e6bc5caf810873e89405822f.tar.bz2 android_packages_apps_Trebuchet-2345e6cdc6aad5c5e6bc5caf810873e89405822f.zip |
Merge "Mouse wheel scroll apps with work profile enabled instead of switching tabs" into ub-launcher3-master
Diffstat (limited to 'src/com')
-rw-r--r-- | src/com/android/launcher3/PagedView.java | 7 | ||||
-rw-r--r-- | src/com/android/launcher3/allapps/AllAppsPagedView.java | 5 |
2 files changed, 12 insertions, 0 deletions
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java index bbb3915b5..764b6dec8 100644 --- a/src/com/android/launcher3/PagedView.java +++ b/src/com/android/launcher3/PagedView.java @@ -1299,6 +1299,9 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou vscroll = -event.getAxisValue(MotionEvent.AXIS_VSCROLL); hscroll = event.getAxisValue(MotionEvent.AXIS_HSCROLL); } + if (Math.abs(vscroll) > Math.abs(hscroll) && !isVerticalScrollable()) { + return true; + } if (hscroll != 0 || vscroll != 0) { boolean isForwardScroll = mIsRtl ? (hscroll < 0 || vscroll < 0) : (hscroll > 0 || vscroll > 0); @@ -1315,6 +1318,10 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou return super.onGenericMotionEvent(event); } + protected boolean isVerticalScrollable() { + return true; + } + private void acquireVelocityTrackerAndAddMovement(MotionEvent ev) { if (mVelocityTracker == null) { mVelocityTracker = VelocityTracker.obtain(); diff --git a/src/com/android/launcher3/allapps/AllAppsPagedView.java b/src/com/android/launcher3/allapps/AllAppsPagedView.java index 69068c6ee..5b7394048 100644 --- a/src/com/android/launcher3/allapps/AllAppsPagedView.java +++ b/src/com/android/launcher3/allapps/AllAppsPagedView.java @@ -81,4 +81,9 @@ public class AllAppsPagedView extends PagedView<PersonalWorkSlidingTabStrip> { public boolean hasOverlappingRendering() { return false; } + + @Override + protected boolean isVerticalScrollable() { + return false; + } } |