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

Merge "Fixing crash when drawing accessibility focus indicator." into jb-dev

Browse Source
This commit is contained in:
Svetoslav Ganov
2012-04-30 12:38:06 -07:00
committed by Android (Google) Code Review
parent 3ea8761974 1d74df2266
commit 18dcf2f1cd
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -635,6 +635,8 @@ public final class ViewRootImpl implements ViewParent,
if (view.getImportantForAccessibility() == View.IMPORTANT_FOR_ACCESSIBILITY_AUTO) {
view.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_YES);
}
setAccessibilityFocusedHost(null);
}
}
}
@@ -2339,6 +2341,9 @@ public final class ViewRootImpl implements ViewParent,
if (mAccessibilityFocusedVirtualView == null) {
mAccessibilityFocusedVirtualView = provider.findAccessibilitiyFocus(View.NO_ID);
}
if (mAccessibilityFocusedVirtualView == null) {
return;
}
mAccessibilityFocusedVirtualView.getBoundsInScreen(bounds);
bounds.offset(-mAttachInfo.mWindowLeft, -mAttachInfo.mWindowTop);
}
@@ -2865,6 +2870,8 @@ public final class ViewRootImpl implements ViewParent,
mHasHadWindowFocus = true;
}
setAccessibilityFocusedHost(null);
if (mView != null && mAccessibilityManager.isEnabled()) {
if (hasWindowFocus) {
mView.sendAccessibilityEvent(
@@ -2883,9 +2890,6 @@ public final class ViewRootImpl implements ViewParent,
if (mAccessibilityFocusedHost == null) {
mView.requestAccessibilityFocus();
}
} else {
// Clear accessibility focus when the window loses input focus.
setAccessibilityFocusedHost(null);
}
}
}