Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8400333 authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by Android Git Automerger
Browse files

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

* commit '2f87014e':
  Enabling accessibility focus only if explore by touch is on.
parents 059d57aa 2f87014e

core/java/android/view/View.java

+2 −1
Original line number Diff line number Diff line
@@ -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) {

core/java/android/view/ViewRootImpl.java

+2 −1
Original line number Diff line number Diff line
@@ -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) {