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

Commit 80ec4ab7 authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "Fix bug 5339708 - edge case in ListView focus restoration"

parents 81453f76 2d8b0170

core/java/android/widget/ListView.java

+1 −0
Original line number Diff line number Diff line
@@ -1651,6 +1651,7 @@ public class ListView extends AbsListView { 
                // are focusable

                if (mItemsCanFocus && hasFocus() && !sel.hasFocus()) {

                    final boolean focusWasTaken = (sel == focusLayoutRestoreDirectChild &&

                            focusLayoutRestoreView != null &&

                            focusLayoutRestoreView.requestFocus()) || sel.requestFocus();

                    if (!focusWasTaken) {

                        // selected item didn't take focus, fine, but still want