diff options
author | Alan Viverette <alanv@google.com> | 2013-10-08 13:13:46 -0700 |
---|---|---|
committer | Alan Viverette <alanv@google.com> | 2013-10-08 13:13:46 -0700 |
commit | 254139a3c74acec5fa34a73be4d159d6baabc6b1 (patch) | |
tree | 95b3c1fa186a4751042a295217f3c00fca82611a /src/com/android/launcher3 | |
parent | cffa7175f8328cfbf6bc9ed1507f1900fe4bc85c (diff) | |
download | android_packages_apps_Trebuchet-254139a3c74acec5fa34a73be4d159d6baabc6b1.tar.gz android_packages_apps_Trebuchet-254139a3c74acec5fa34a73be4d159d6baabc6b1.tar.bz2 android_packages_apps_Trebuchet-254139a3c74acec5fa34a73be4d159d6baabc6b1.zip |
Fix scrolling accessibility events sent from PagedView
BUG: 11087905
Change-Id: Id4852dc04ee1aca25ccb0eba094b34c6b87d6d41
Diffstat (limited to 'src/com/android/launcher3')
-rw-r--r-- | src/com/android/launcher3/PagedView.java | 11 |
1 files changed, 9 insertions, 2 deletions
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 { @@ -2752,6 +2751,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); event.setScrollable(true); |