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

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

Browse Source 
* commit 'd4a55216c1b461d6e7dc20ab77a24bd3a53e3119':
  Fix scrolling accessibility events sent from PagedView
This commit is contained in:
Alan Viverette
2013-10-08 14:32:50 -07:00
committed by Android Git Automerger
parent 8e25924bb9 d4a55216c1
commit 6693496610
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);