diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2012-04-30 12:41:15 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-30 12:41:15 -0700 |
| commit | 2f87014ea2f177e715032b07004d05e2549a63a8 (patch) | |
| tree | 6337fa53ad38c73cb596b809c5a0d8f492daf470 | |
| parent | 0e8fd5eddb8fe09e47732d1659c682b7eeee646b (diff) | |
| parent | 07b726c86b1d0b22e51b08cb4234f8212864d9f9 (diff) | |
| download | frameworks_base-2f87014ea2f177e715032b07004d05e2549a63a8.zip frameworks_base-2f87014ea2f177e715032b07004d05e2549a63a8.tar.gz frameworks_base-2f87014ea2f177e715032b07004d05e2549a63a8.tar.bz2 | |
Merge "Enabling accessibility focus only if explore by touch is on." into jb-dev
| -rw-r--r-- | core/java/android/view/View.java | 3 | ||||
| -rw-r--r-- | core/java/android/view/ViewRootImpl.java | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 081b765..092bcbd 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -5960,7 +5960,8 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal * @hide */ public boolean requestAccessibilityFocus() { - if (!AccessibilityManager.getInstance(mContext).isEnabled()) { + AccessibilityManager manager = AccessibilityManager.getInstance(mContext); + if (!manager.isEnabled() || !manager.isTouchExplorationEnabled()) { return false; } if ((mViewFlags & VISIBILITY_MASK) != VISIBLE) { diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index 62c87ac..21e57db 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -2318,7 +2318,8 @@ public final class ViewRootImpl implements ViewParent, * @param canvas The canvas on which to draw. */ private void drawAccessibilityFocusedDrawableIfNeeded(Canvas canvas) { - if (!AccessibilityManager.getInstance(mView.mContext).isEnabled()) { + AccessibilityManager manager = AccessibilityManager.getInstance(mView.mContext); + if (!manager.isEnabled() || !manager.isTouchExplorationEnabled()) { return; } if (mAccessibilityFocusedHost == null || mAccessibilityFocusedHost.mAttachInfo == null) { |