Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'c5fb5805c92429b08ca715df37e949f31591466a':
  Accessiblity focus not following input focus and text nav broken.
This commit is contained in:
Svetoslav Ganov
2012-05-16 13:30:22 -07:00
committed by Android Git Automerger
parent 097000bb30 c5fb5805c9
commit c2f6411741
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/view/View.java
View File

@@ -6159,7 +6159,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);
}
}
@@ -6637,7 +6638,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);
@@ -6661,7 +6662,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);