openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove code duplication 

Bug: 72222505
Test: Manual
Change-Id: I6ae6ac7474b44c16bd765635e32d2e843bc02cac
This commit is contained in:
Vadim Tryshev 2018-05-18 18:41:34 -07:00
parent b05b489f04
commit 98913d0c95
2 changed files with 22 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/com/android/launcher3/PagedView.java
View File

@ -1495,12 +1495,20 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
return Math.abs(delta) > 0; return Math.abs(delta) > 0;
} }
public void scrollLeft() { public boolean scrollLeft() {
if (getNextPage() > 0) snapToPage(getNextPage() - 1); if (getNextPage() > 0) {
snapToPage(getNextPage() - 1);
return true;
}
return false;
} }
public void scrollRight() { public boolean scrollRight() {
if (getNextPage() < getChildCount() -1) snapToPage(getNextPage() + 1); if (getNextPage() < getChildCount() - 1) {
snapToPage(getNextPage() + 1);
return true;
}
return false;
} }
@Override @Override
@ -1551,22 +1559,6 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
event.setScrollable(getPageCount() > 1); event.setScrollable(getPageCount() > 1);
} }
private boolean accessibilityScrollLeft() {
if (getCurrentPage() > 0) {
scrollLeft();
return true;
}
return false;
}
private boolean accessibilityScrollRight() {
if (getCurrentPage() < getPageCount() - 1) {
scrollRight();
return true;
}
return false;
}
@Override @Override
public boolean performAccessibilityAction(int action, Bundle arguments) { public boolean performAccessibilityAction(int action, Bundle arguments) {
if (super.performAccessibilityAction(action, arguments)) { if (super.performAccessibilityAction(action, arguments)) {
@ -1575,12 +1567,12 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
final boolean pagesFlipped = isPageOrderFlipped(); final boolean pagesFlipped = isPageOrderFlipped();
switch (action) { switch (action) {
case AccessibilityNodeInfo.ACTION_SCROLL_FORWARD: { case AccessibilityNodeInfo.ACTION_SCROLL_FORWARD: {
if (pagesFlipped ? accessibilityScrollLeft() : accessibilityScrollRight()) { if (pagesFlipped ? scrollLeft() : scrollRight()) {
return true; return true;
} }
} break; } break;
case AccessibilityNodeInfo.ACTION_SCROLL_BACKWARD: { case AccessibilityNodeInfo.ACTION_SCROLL_BACKWARD: {
if (pagesFlipped ? accessibilityScrollRight() : accessibilityScrollLeft()) { if (pagesFlipped ? scrollRight() : scrollLeft()) {
return true; return true;
} }
} }

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

@ -2961,25 +2961,29 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
} }
@Override @Override
public void scrollLeft() { public boolean scrollLeft() {
boolean result = false;
if (!workspaceInModalState() && !mIsSwitchingState) { if (!workspaceInModalState() && !mIsSwitchingState) {
super.scrollLeft(); result = super.scrollLeft();
} }
Folder openFolder = Folder.getOpen(mLauncher); Folder openFolder = Folder.getOpen(mLauncher);
if (openFolder != null) { if (openFolder != null) {
openFolder.completeDragExit(); openFolder.completeDragExit();
} }
return result;
} }
@Override @Override
public void scrollRight() { public boolean scrollRight() {
boolean result = false;
if (!workspaceInModalState() && !mIsSwitchingState) { if (!workspaceInModalState() && !mIsSwitchingState) {
super.scrollRight(); result = super.scrollRight();
} }
Folder openFolder = Folder.getOpen(mLauncher); Folder openFolder = Folder.getOpen(mLauncher);
if (openFolder != null) { if (openFolder != null) {
openFolder.completeDragExit(); openFolder.completeDragExit();
} }
return result;
} }
/** /**