PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix scrolling accessibility events sent from PagedView" into jb-ub-now-indigo-rose

Browse Source
This commit is contained in:
Alan Viverette
2013-10-08 21:31:12 +00:00
committed by Android (Google) Code Review
parent ba65185edd 254139a3c7
commit d4a55216c1
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/PagedView.java
+9 -2
View File
@@ -668,11 +668,10 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
if (am.isEnabled()) {
AccessibilityEvent ev =
AccessibilityEvent.obtain(AccessibilityEvent.TYPE_VIEW_SCROLLED);
ev.getText().add("");
ev.setItemCount(getChildCount());
ev.setFromIndex(mCurrentPage);
int action = AccessibilityNodeInfo.ACTION_SCROLL_FORWARD;
final int action;
if (getNextPage() >= mCurrentPage) {
action = AccessibilityNodeInfo.ACTION_SCROLL_FORWARD;
} else {
@@ -2753,6 +2752,14 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
}
}
@Override
public void sendAccessibilityEvent(int eventType) {
// Don't let the view send real scroll events.
if (eventType != AccessibilityEvent.TYPE_VIEW_SCROLLED) {
super.sendAccessibilityEvent(eventType);
}
}
@Override
public void onInitializeAccessibilityEvent(AccessibilityEvent event) {
super.onInitializeAccessibilityEvent(event);