am 407630e7: am f12c91f5: Merge "Remember focused child during layout when adapter has stable IDs" into mnc-dev

* commit '407630e765c3b9900c5bee0e1ae8e4154c5b6af8':
  Remember focused child during layout when adapter has stable IDs
This commit is contained in:
Alan Viverette
2015-07-07 23:58:21 +00:00
committed by Android Git Automerger

View File

@@ -1621,7 +1621,8 @@ public class ListView extends AbsListView {
// We can remember the focused view to restore after re-layout
// if the data hasn't changed, or if the focused position is a
// header or footer.
if (!dataChanged || isDirectChildHeaderOrFooter(focusedChild)) {
if (!dataChanged || isDirectChildHeaderOrFooter(focusedChild)
|| focusedChild.hasTransientState() || mAdapterHasStableIds) {
focusLayoutRestoreDirectChild = focusedChild;
// Remember the specific view that had focus.
focusLayoutRestoreView = findFocus();