diff options
| author | Vadim Tryshev <vadimt@google.com> | 2015-05-13 17:42:30 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-13 17:42:31 +0000 |
| commit | 8a496ac99e6418c6e05fc8cc6f2c72bdf7c125d5 (patch) | |
| tree | a91c6a93dcd5c41bddeb4ded4c21e7509c1b217e /src/com/android/launcher3/PagedView.java | |
| parent | 927b36ae0b5bf85ba26bd8c8f88918fdb18df1ff (diff) | |
| parent | f4715974b80d06993342ca62b1298e4d90e2fab8 (diff) | |
| download | android_packages_apps_Trebuchet-8a496ac99e6418c6e05fc8cc6f2c72bdf7c125d5.tar.gz android_packages_apps_Trebuchet-8a496ac99e6418c6e05fc8cc6f2c72bdf7c125d5.tar.bz2 android_packages_apps_Trebuchet-8a496ac99e6418c6e05fc8cc6f2c72bdf7c125d5.zip | |
Merge "Fixing accessibility scrolling events generated by PagedView:" into ub-launcher3-burnaby
Diffstat (limited to 'src/com/android/launcher3/PagedView.java')
| -rw-r--r-- | src/com/android/launcher3/PagedView.java | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java index aa8656730..c8e7d9c0b 100644 --- a/src/com/android/launcher3/PagedView.java +++ b/src/com/android/launcher3/PagedView.java @@ -636,21 +636,15 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc AccessibilityManager am = (AccessibilityManager) getContext().getSystemService(Context.ACCESSIBILITY_SERVICE); if (am.isEnabled()) { - AccessibilityEvent ev = - AccessibilityEvent.obtain(AccessibilityEvent.TYPE_VIEW_SCROLLED); - ev.setItemCount(getChildCount()); - ev.setFromIndex(mCurrentPage); - ev.setToIndex(getNextPage()); - - final int action; - if (getNextPage() >= mCurrentPage) { - action = AccessibilityNodeInfo.ACTION_SCROLL_FORWARD; - } else { - action = AccessibilityNodeInfo.ACTION_SCROLL_BACKWARD; + if (mCurrentPage != getNextPage()) { + AccessibilityEvent ev = + AccessibilityEvent.obtain(AccessibilityEvent.TYPE_VIEW_SCROLLED); + ev.setItemCount(getChildCount()); + ev.setFromIndex(getNextPage()); + ev.setToIndex(getNextPage()); + + sendAccessibilityEventUnchecked(ev); } - - ev.setAction(action); - sendAccessibilityEventUnchecked(ev); } } @@ -2133,8 +2127,6 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc focusedChild.clearFocus(); } - sendScrollAccessibilityEvent(); - pageBeginMoving(); awakenScrollBars(duration); if (immediate) { |