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

Merge "Fixing reverted order of accessibility scrolling in Recents" into ub-launcher3-edmonton

This commit is contained in:
Vadim Tryshev 2018-05-19 00:54:37 +00:00 committed by Android (Google) Code Review
parent 3bdb81868d 0fc0713253
commit 4ae69dea49
2 changed files with 46 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
quickstep/src/com/android/quickstep/views/RecentsView.java
View File

@ -1311,4 +1311,20 @@ public abstract class RecentsView<T extends BaseActivity> extends PagedView impl
public void revealClearAllButton() {
scrollTo(mIsRtl ? 0 : computeMaxScrollX(), 0);
}
@Override
public void addChildrenForAccessibility(ArrayList<View> outChildren) {
if (FLIP_RECENTS) {
for (int i = getChildCount() - 1; i >= 0; --i) {
outChildren.add(getChildAt(i));
}
} else {
super.addChildrenForAccessibility(outChildren);
}
}
@Override
protected boolean isPageOrderFlipped() {
return FLIP_RECENTS;
}
}

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

@ -1510,17 +1510,24 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
return ScrollView.class.getName();
}
protected boolean isPageOrderFlipped() {
return false;
}
/* Accessibility */
@SuppressWarnings("deprecation")
@Override
public void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info) {
super.onInitializeAccessibilityNodeInfo(info);
final boolean pagesFlipped = isPageOrderFlipped();
info.setScrollable(getPageCount() > 1);
if (getCurrentPage() < getPageCount() - 1) {
info.addAction(AccessibilityNodeInfo.ACTION_SCROLL_FORWARD);
info.addAction(pagesFlipped ? AccessibilityNodeInfo.ACTION_SCROLL_BACKWARD
: AccessibilityNodeInfo.ACTION_SCROLL_FORWARD);
}
if (getCurrentPage() > 0) {
info.addAction(AccessibilityNodeInfo.ACTION_SCROLL_BACKWARD);
info.addAction(pagesFlipped ? AccessibilityNodeInfo.ACTION_SCROLL_FORWARD
: AccessibilityNodeInfo.ACTION_SCROLL_BACKWARD);
}
// Accessibility-wise, PagedView doesn't support long click, so disabling it.
@ -1544,24 +1551,40 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
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
public boolean performAccessibilityAction(int action, Bundle arguments) {
if (super.performAccessibilityAction(action, arguments)) {
return true;
}
final boolean pagesFlipped = isPageOrderFlipped();
switch (action) {
case AccessibilityNodeInfo.ACTION_SCROLL_FORWARD: {
if (getCurrentPage() < getPageCount() - 1) {
scrollRight();
if (pagesFlipped ? accessibilityScrollLeft() : accessibilityScrollRight()) {
return true;
}
} break;
case AccessibilityNodeInfo.ACTION_SCROLL_BACKWARD: {
if (getCurrentPage() > 0) {
scrollLeft();
if (pagesFlipped ? accessibilityScrollRight() : accessibilityScrollLeft()) {
return true;
}
} break;
}
break;
}
return false;
}