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

Merge "Accessibility focus and input focus do not sync - part 2" into jb-dev

Browse Source
This commit is contained in:
Svetoslav Ganov
2012-05-21 17:49:09 -07:00
committed by Android (Google) Code Review
parent 493743e013 525ae2075c
commit f40628645d
2 changed files with 0 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6212,15 +6212,6 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal
// Clear the text navigation state.
setAccessibilityCursorPosition(-1);
// Try to move accessibility focus to the input focus.
View rootView = getRootView();
if (rootView != null) {
View inputFocus = rootView.findFocus();
if (inputFocus != null) {
inputFocus.requestAccessibilityFocus();
}
}
}
}

14
core/java/android/view/ViewRootImpl.java
View File

@@ -2895,20 +2895,6 @@ public final class ViewRootImpl implements ViewParent,
if (hasWindowFocus) {
mView.sendAccessibilityEvent(
AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED);
// Give accessibility focus to the view that has input
// focus if such, otherwise to the first one.
if (mView instanceof ViewGroup) {
ViewGroup viewGroup = (ViewGroup) mView;
View focused = viewGroup.findFocus();
if (focused != null) {
focused.requestAccessibilityFocus();
}
}
// There is no accessibility focus, despite our effort
// above, now just give it to the first view.
if (mAccessibilityFocusedHost == null) {
mView.requestAccessibilityFocus();
}
}
}
}