diff options
| author | Maxim Bogatov <maximbogatov@google.com> | 2015-04-30 01:16:01 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-30 01:16:02 +0000 |
| commit | aba56b648fd559d445ba04c3bdfcb9cdb048f729 (patch) | |
| tree | c3f5ca7222f677a1e27b043ad1db822c1952e9d2 /core/java/com | |
| parent | 4169649a53efa065e15a1b6d5fa27b61a87a8613 (diff) | |
| parent | ac6ffce1711b84682521e6c2e55865c60929fd88 (diff) | |
| download | frameworks_base-aba56b648fd559d445ba04c3bdfcb9cdb048f729.zip frameworks_base-aba56b648fd559d445ba04c3bdfcb9cdb048f729.tar.gz frameworks_base-aba56b648fd559d445ba04c3bdfcb9cdb048f729.tar.bz2 | |
Merge "Add accessibility actions for scrolling in different directions"
Diffstat (limited to 'core/java/com')
| -rw-r--r-- | core/java/com/android/internal/widget/ViewPager.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/core/java/com/android/internal/widget/ViewPager.java b/core/java/com/android/internal/widget/ViewPager.java index 441e640..e76302b 100644 --- a/core/java/com/android/internal/widget/ViewPager.java +++ b/core/java/com/android/internal/widget/ViewPager.java @@ -47,6 +47,8 @@ import android.view.animation.Interpolator; import android.widget.EdgeEffect; import android.widget.Scroller; +import com.android.internal.R; + import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; @@ -2720,10 +2722,12 @@ public class ViewPager extends ViewGroup { if (canScrollHorizontally(1)) { info.addAction(AccessibilityAction.ACTION_SCROLL_FORWARD); + info.addAction(AccessibilityAction.ACTION_SCROLL_RIGHT); } if (canScrollHorizontally(-1)) { info.addAction(AccessibilityAction.ACTION_SCROLL_BACKWARD); + info.addAction(AccessibilityAction.ACTION_SCROLL_LEFT); } } @@ -2735,12 +2739,14 @@ public class ViewPager extends ViewGroup { switch (action) { case AccessibilityNodeInfo.ACTION_SCROLL_FORWARD: + case R.id.accessibilityActionScrollRight: if (canScrollHorizontally(1)) { setCurrentItem(mCurItem + 1); return true; } return false; case AccessibilityNodeInfo.ACTION_SCROLL_BACKWARD: + case R.id.accessibilityActionScrollLeft: if (canScrollHorizontally(-1)) { setCurrentItem(mCurItem - 1); return true; |