commit 04a9bc4a50dd0d7438d4c3f980c82db5305c2d76
author Vadim Tryshev <vadimt@google.com> Thu May 28 22:07:56 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 28 22:07:56 2015 +0000
tree 5ca131a88e05ffd9ca96b1ef2e700be6db41d4a6
parent eabf77ca9621393a0a32e16e7640888de08f1ea9
parent 7066c1235f2531d90c44c2db279a407b44cfc263

Merge "Setting scroll X, Y and related attributes for TYPE_VIEW_SCROLLED event." 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 7fdaabb..9271e8b 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -623,6 +623,11 @@
             if (mCurrentPage != getNextPage()) {
                 AccessibilityEvent ev =
                         AccessibilityEvent.obtain(AccessibilityEvent.TYPE_VIEW_SCROLLED);
+                ev.setScrollable(true);
+                ev.setScrollX(getScrollX());
+                ev.setScrollY(getScrollY());
+                ev.setMaxScrollX(mMaxScrollX);
+                ev.setMaxScrollY(0);
 
                 sendAccessibilityEventUnchecked(ev);
             }
@@ -2349,7 +2354,7 @@
     @Override
     public void onInitializeAccessibilityEvent(AccessibilityEvent event) {
         super.onInitializeAccessibilityEvent(event);
-        event.setScrollable(true);
+        event.setScrollable(getPageCount() > 1);
     }
 
     @Override