diff options
author | Samuel Fufa <sfufa@google.com> | 2019-11-14 21:53:04 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-11-14 21:53:04 +0000 |
commit | 574e8413ba423ea3dcea450f1ebd1e5d29cdc523 (patch) | |
tree | 5d221787b372dd06864a1e451d8f8d958c3a2eac /src | |
parent | 16691a72bf858c20fae404b9e859b2130c6d18e9 (diff) | |
parent | 8fb487413c7df49f29a530e3bc411442aa737dbc (diff) | |
download | android_packages_apps_Trebuchet-574e8413ba423ea3dcea450f1ebd1e5d29cdc523.tar.gz android_packages_apps_Trebuchet-574e8413ba423ea3dcea450f1ebd1e5d29cdc523.tar.bz2 android_packages_apps_Trebuchet-574e8413ba423ea3dcea450f1ebd1e5d29cdc523.zip |
Merge "Enable a11y scrolling with item drag" into ub-launcher3-qt-future-dev
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/launcher3/Workspace.java | 8 |
1 files changed, 6 insertions, 2 deletions
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<WorkspacePageIndicator> 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<WorkspacePageIndicator> @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<WorkspacePageIndicator> @Override public boolean scrollRight() { boolean result = false; - if (!workspaceInModalState() && !mIsSwitchingState) { + if (!mIsSwitchingState && workspaceInScrollableState()) { result = super.scrollRight(); } Folder openFolder = Folder.getOpen(mLauncher); |