From 254139a3c74acec5fa34a73be4d159d6baabc6b1 Mon Sep 17 00:00:00 2001 From: Alan Viverette Date: Tue, 8 Oct 2013 13:13:46 -0700 Subject: Fix scrolling accessibility events sent from PagedView BUG: 11087905 Change-Id: Id4852dc04ee1aca25ccb0eba094b34c6b87d6d41 --- src/com/android/launcher3/PagedView.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'src/com/android/launcher3/PagedView.java') diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java index 96d8c1928..21826806a 100644 --- a/src/com/android/launcher3/PagedView.java +++ b/src/com/android/launcher3/PagedView.java @@ -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 { @@ -2751,6 +2750,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); -- cgit v1.2.3