summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorVadim Tryshev <vadimt@google.com>2015-05-28 22:07:56 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-28 22:07:56 +0000
commit04a9bc4a50dd0d7438d4c3f980c82db5305c2d76 (patch)
tree5ca131a88e05ffd9ca96b1ef2e700be6db41d4a6 /src
parenteabf77ca9621393a0a32e16e7640888de08f1ea9 (diff)
parent7066c1235f2531d90c44c2db279a407b44cfc263 (diff)
downloadandroid_packages_apps_Trebuchet-04a9bc4a50dd0d7438d4c3f980c82db5305c2d76.tar.gz
android_packages_apps_Trebuchet-04a9bc4a50dd0d7438d4c3f980c82db5305c2d76.tar.bz2
android_packages_apps_Trebuchet-04a9bc4a50dd0d7438d4c3f980c82db5305c2d76.zip
Merge "Setting scroll X, Y and related attributes for TYPE_VIEW_SCROLLED event." into ub-launcher3-burnaby
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/PagedView.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index 7fdaabb91..9271e8b15 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -623,6 +623,11 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
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 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
@Override
public void onInitializeAccessibilityEvent(AccessibilityEvent event) {
super.onInitializeAccessibilityEvent(event);
- event.setScrollable(true);
+ event.setScrollable(getPageCount() > 1);
}
@Override