commit 8a496ac99e6418c6e05fc8cc6f2c72bdf7c125d5
author Vadim Tryshev <vadimt@google.com> Wed May 13 17:42:30 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 13 17:42:31 2015 +0000
tree a91c6a93dcd5c41bddeb4ded4c21e7509c1b217e
parent 927b36ae0b5bf85ba26bd8c8f88918fdb18df1ff
parent f4715974b80d06993342ca62b1298e4d90e2fab8

Merge "Fixing accessibility scrolling events generated by PagedView:" into ub-launcher3-burnaby

src/com/android/launcher3/PagedView.java

diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index aa86567..c8e7d9c 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -636,21 +636,15 @@
         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());
+            if (mCurrentPage != getNextPage()) {
+                AccessibilityEvent ev =
+                        AccessibilityEvent.obtain(AccessibilityEvent.TYPE_VIEW_SCROLLED);
+                ev.setItemCount(getChildCount());
+                ev.setFromIndex(getNextPage());
+                ev.setToIndex(getNextPage());
 
-            final int action;
-            if (getNextPage() >= mCurrentPage) {
-                action = AccessibilityNodeInfo.ACTION_SCROLL_FORWARD;
-            } else {
-                action = AccessibilityNodeInfo.ACTION_SCROLL_BACKWARD;
+                sendAccessibilityEventUnchecked(ev);
             }
-
-            ev.setAction(action);
-            sendAccessibilityEventUnchecked(ev);
         }
     }
 
@@ -2133,8 +2127,6 @@
             focusedChild.clearFocus();
         }
 
-        sendScrollAccessibilityEvent();
-
         pageBeginMoving();
         awakenScrollBars(duration);
         if (immediate) {