diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2012-05-16 18:45:31 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-16 18:45:31 -0700 |
| commit | cefd97c8546d6dca184e8ac9589ab2ff1b795c06 (patch) | |
| tree | e29e8731059a4f5cbd92b93bbcbb582653916147 /core/java/android/widget/Gallery.java | |
| parent | 040b93110cc1183d646ad148993bb1c9e6ceb71c (diff) | |
| parent | e54c5f13652166c5896ccfa55f047301a6c8b876 (diff) | |
am e54c5f13: Merge "Exposing some accessiblity actions only for enabled views." into jb-dev
* commit 'e54c5f13652166c5896ccfa55f047301a6c8b876':
Exposing some accessiblity actions only for enabled views.
Diffstat (limited to 'core/java/android/widget/Gallery.java')
| -rw-r--r-- | core/java/android/widget/Gallery.java | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/core/java/android/widget/Gallery.java b/core/java/android/widget/Gallery.java index c8e702ce4ead..d58ddf8145f7 100644 --- a/core/java/android/widget/Gallery.java +++ b/core/java/android/widget/Gallery.java @@ -1369,11 +1369,13 @@ public class Gallery extends AbsSpinner implements GestureDetector.OnGestureList super.onInitializeAccessibilityNodeInfo(info); info.setClassName(Gallery.class.getName()); info.setScrollable(mItemCount > 1); - if (mItemCount > 0 && mSelectedPosition < mItemCount - 1) { - info.addAction(AccessibilityNodeInfo.ACTION_SCROLL_FORWARD); - } - if (mItemCount > 0 && mSelectedPosition > 0) { - info.addAction(AccessibilityNodeInfo.ACTION_SCROLL_BACKWARD); + if (isEnabled()) { + if (mItemCount > 0 && mSelectedPosition < mItemCount - 1) { + info.addAction(AccessibilityNodeInfo.ACTION_SCROLL_FORWARD); + } + if (isEnabled() && mItemCount > 0 && mSelectedPosition > 0) { + info.addAction(AccessibilityNodeInfo.ACTION_SCROLL_BACKWARD); + } } } @@ -1384,13 +1386,13 @@ public class Gallery extends AbsSpinner implements GestureDetector.OnGestureList } switch (action) { case AccessibilityNodeInfo.ACTION_SCROLL_FORWARD: { - if (mItemCount > 0 && mSelectedPosition < mItemCount - 1) { + if (isEnabled() && mItemCount > 0 && mSelectedPosition < mItemCount - 1) { final int currentChildIndex = mSelectedPosition - mFirstPosition; return scrollToChild(currentChildIndex + 1); } } return false; case AccessibilityNodeInfo.ACTION_SCROLL_BACKWARD: { - if (mItemCount > 0 && mSelectedPosition > 0) { + if (isEnabled() && mItemCount > 0 && mSelectedPosition > 0) { final int currentChildIndex = mSelectedPosition - mFirstPosition; return scrollToChild(currentChildIndex - 1); } |