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

Merge "Fix problem with ListView accessibility focus" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-03-29 17:47:08 +00:00
committed by Android (Google) Code Review
parent bf6b4efa6d ec66fb8f99
commit 36bceefafa
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/widget/AbsListView.java
View File

@@ -6873,9 +6873,11 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
mTransientStateViews.put(position, scrap); mTransientStateViews.put(position, scrap);
} else { } else {
// Otherwise, we'll have to remove the view and start over. // Otherwise, we'll have to remove the view and start over.
clearScrapForRebind(scrap);
getSkippedScrap().add(scrap); getSkippedScrap().add(scrap);
} }
} else { } else {
clearScrapForRebind(scrap);
if (mViewTypeCount == 1) { if (mViewTypeCount == 1) {
mCurrentScrap.add(scrap); mCurrentScrap.add(scrap);
} else { } else {
@@ -7098,12 +7100,12 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
} }
} else if (params.scrappedFromPosition == position) { } else if (params.scrappedFromPosition == position) {
final View scrap = scrapViews.remove(i); final View scrap = scrapViews.remove(i);
clearAccessibilityFromScrap(scrap); clearScrapForRebind(scrap);
return scrap; return scrap;
} }
} }
final View scrap = scrapViews.remove(size - 1); final View scrap = scrapViews.remove(size - 1);
clearAccessibilityFromScrap(scrap); clearScrapForRebind(scrap);
return scrap; return scrap;
} else { } else {
return null; return null;
@@ -7117,7 +7119,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
} }
} }
private void clearAccessibilityFromScrap(View view) { private void clearScrapForRebind(View view) {
view.clearAccessibilityFocus(); view.clearAccessibilityFocus();
view.setAccessibilityDelegate(null); view.setAccessibilityDelegate(null);
} }

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

@@ -1639,7 +1639,7 @@ public class ListView extends AbsListView {
final View focusChild = getAccessibilityFocusedChild(focusHost); final View focusChild = getAccessibilityFocusedChild(focusHost);
if (focusChild != null) { if (focusChild != null) {
if (!dataChanged || isDirectChildHeaderOrFooter(focusChild) if (!dataChanged || isDirectChildHeaderOrFooter(focusChild)
|| focusChild.hasTransientState() || mAdapterHasStableIds) { || (focusChild.hasTransientState() && mAdapterHasStableIds)) {
// The views won't be changing, so try to maintain // The views won't be changing, so try to maintain
// focus on the current host and virtual view. // focus on the current host and virtual view.
accessibilityFocusLayoutRestoreView = focusHost; accessibilityFocusLayoutRestoreView = focusHost;