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

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

am c2f64117: am c5fb5805: Merge "Accessiblity focus not following input focus... 

am c2f64117: am c5fb5805: Merge "Accessiblity focus not following input focus and text nav broken." into jb-dev

* commit 'c2f64117':
  Accessiblity focus not following input focus and text nav broken.
parents 3d6d6a71 c2f64117

core/java/android/view/View.java

+4 −3
Original line number Diff line number Diff line
@@ -6139,7 +6139,8 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal 
        ViewRootImpl viewRootImpl = getViewRootImpl();

        if (viewRootImpl != null) {

            View focusHost = viewRootImpl.getAccessibilityFocusedHost();

            if (focusHost != null && ViewRootImpl.isViewDescendantOf(focusHost, this)) {

            if (focusHost != null && focusHost != this

                    && ViewRootImpl.isViewDescendantOf(focusHost, this)) {

                viewRootImpl.setAccessibilityFocusedHost(null);

            }

        }
@@ -6617,7 +6618,7 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal 














    private boolean nextAtGranularity(int granularity) {















        CharSequence text = getIterableTextForAccessibility();













        if (text != null && text.length() > 0) {













        if (text == null || text.length() == 0) {















            return false;















        }















        TextSegmentIterator iterator = getIteratorForGranularity(granularity);









@@ -6641,7 +6642,7 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal



























    private boolean previousAtGranularity(int granularity) {















        CharSequence text = getIterableTextForAccessibility();













        if (text != null && text.length() > 0) {













        if (text == null || text.length() == 0) {















            return false;















        }















        TextSegmentIterator iterator = getIteratorForGranularity(granularity);