Merge "Enabling accessibility focus only if explore by touch is on." into jb-dev

Author: sganov

core/java/android/view/View.java

@@ -5960,7 +5960,8 @@ boolean isAccessibilityFocused() {
      * @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) {

core/java/android/view/ViewRootImpl.java

@@ -2318,7 +2318,8 @@ private boolean drawSoftware(Surface surface, AttachInfo attachInfo, int yoff,
      * @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) {