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

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

Browse Source 
* commit 'f12c91f5e67171bae0d36e89a507c96ff81d04a2':
  Remember focused child during layout when adapter has stable IDs
This commit is contained in:
Alan Viverette
2015-07-07 23:37:39 +00:00
committed by Android Git Automerger
parent 0f7b02733d f12c91f5e6
commit 407630e765
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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