aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-18 10:18:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Enable a11y scrolling with item drag" into ub-launcher3-qt-future-dev

Browse Source 
am: 574e8413ba

Change-Id: I37c71d6f55d2478d029a9509ca61d32599582442
This commit is contained in:
Samuel Fufa
2019-11-14 14:04:35 -08:00
committed by android-build-merger
parent 10b106dc8a 574e8413ba
commit ddab25da6b
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/launcher3/Workspace.java
View File

@@ -1278,6 +1278,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);