diff options
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); |