Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 382fe3b8 authored by Alan Viverette's avatar Alan Viverette Committed by Android Git Automerger
Browse files

am 292a1564: am 407630e7: am f12c91f5: Merge "Remember focused child during... 

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

* commit '292a1564':
  Remember focused child during layout when adapter has stable IDs
parents ff2a49c8 292a1564

core/java/android/widget/ListView.java

+2 −1
Original line number Diff line number Diff line
@@ -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();