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

am 1434e29a: Merge "Check for null ViewRootImpl when saving accessibility focus in ListView." into jb-mr1-dev

Browse Source 
* commit '1434e29ac6a157130c9882606ca577567c91ddc4':
  Check for null ViewRootImpl when saving accessibility focus in ListView.
This commit is contained in:
Svetoslav Ganov
2012-09-10 11:33:28 -07:00
committed by Android Git Automerger
parent d6a6c45bf3 1434e29ac6
commit ef94c988a2
1 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
core/java/android/widget/ListView.java
View File

@@ -38,6 +38,7 @@ import android.view.View;
import android.view.ViewDebug;
import android.view.ViewGroup;
import android.view.ViewParent;
import android.view.ViewRootImpl;
import android.view.accessibility.AccessibilityEvent;
import android.view.accessibility.AccessibilityNodeInfo;
import android.widget.RemoteViews.RemoteView;
@@ -1590,20 +1591,25 @@ public class ListView extends AbsListView {
}
// Remember which child, if any, had accessibility focus.
final View accessFocusedView = getViewRootImpl().getAccessibilityFocusedHost();
if (accessFocusedView != null) {
final View accessFocusedChild = findAccessibilityFocusedChild(accessFocusedView);
if (accessFocusedChild != null) {
if (!dataChanged || isDirectChildHeaderOrFooter(accessFocusedChild)) {
// If the views won't be changing, try to maintain focus
// on the current view host and (if applicable) its
// virtual view.
accessibilityFocusLayoutRestoreView = accessFocusedView;
accessibilityFocusLayoutRestoreNode = getViewRootImpl()
.getAccessibilityFocusedVirtualView();
} else {
// Otherwise, try to maintain focus at the same position.
accessibilityFocusPosition = getPositionForView(accessFocusedChild);
final ViewRootImpl viewRootImpl = getViewRootImpl();
if (viewRootImpl != null) {
final View accessFocusedView = viewRootImpl.getAccessibilityFocusedHost();
if (accessFocusedView != null) {
final View accessFocusedChild = findAccessibilityFocusedChild(
accessFocusedView);
if (accessFocusedChild != null) {
if (!dataChanged || isDirectChildHeaderOrFooter(accessFocusedChild)) {
// If the views won't be changing, try to maintain
// focus on the current view host and (if
// applicable) its virtual view.
accessibilityFocusLayoutRestoreView = accessFocusedView;
accessibilityFocusLayoutRestoreNode = viewRootImpl
.getAccessibilityFocusedVirtualView();
} else {
// Otherwise, try to maintain focus at the same
// position.
accessibilityFocusPosition = getPositionForView(accessFocusedChild);
}
}
}
}