From 59cba191c31b2aadc601732e4204a3209b46db65 Mon Sep 17 00:00:00 2001 From: Samuel Fufa Date: Thu, 22 Aug 2019 18:31:34 -0700 Subject: [PATCH] Mouse wheel scroll apps with work profile enabled instead of switching tabs Test: Manual Bug:79164903 Change-Id: I4b382034ea5b91b24dcc158bd9fa46d64f54cc7a --- src/com/android/launcher3/PagedView.java | 7 +++++++ src/com/android/launcher3/allapps/AllAppsPagedView.java | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java index bbb3915b58..764b6dec8a 100644 --- a/src/com/android/launcher3/PagedView.java +++ b/src/com/android/launcher3/PagedView.java @@ -1299,6 +1299,9 @@ public abstract class PagedView 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 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 69068c6ee6..5b73940488 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 { public boolean hasOverlappingRendering() { return false; } + + @Override + protected boolean isVerticalScrollable() { + return false; + } }