From 8fb487413c7df49f29a530e3bc411442aa737dbc Mon Sep 17 00:00:00 2001 From: Samuel Fufa Date: Tue, 12 Nov 2019 13:28:26 -0800 Subject: Enable a11y scrolling with item drag Bug:142300278 Test:Manual Change-Id: Ieb79dac8a793f5adfe715b1cbe5b7ecae95a26b5 --- src/com/android/launcher3/Workspace.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 474c59df9..9eeb2866b 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -1275,6 +1275,10 @@ public class Workspace extends PagedView return !mLauncher.isInState(NORMAL); } + private boolean workspaceInScrollableState() { + return mLauncher.isInState(SPRING_LOADED) || !workspaceInModalState(); + } + /** Returns whether a drag should be allowed to be started from the current workspace state. */ public boolean workspaceIconsCanBeDragged() { return mLauncher.getStateManager().getState().workspaceIconsCanBeDragged; @@ -2879,7 +2883,7 @@ public class Workspace extends PagedView @Override public boolean scrollLeft() { boolean result = false; - if (!workspaceInModalState() && !mIsSwitchingState) { + if (!mIsSwitchingState && workspaceInScrollableState()) { result = super.scrollLeft(); } Folder openFolder = Folder.getOpen(mLauncher); @@ -2892,7 +2896,7 @@ public class Workspace extends PagedView @Override public boolean scrollRight() { boolean result = false; - if (!workspaceInModalState() && !mIsSwitchingState) { + if (!mIsSwitchingState && workspaceInScrollableState()) { result = super.scrollRight(); } Folder openFolder = Folder.getOpen(mLauncher); -- cgit v1.2.3