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

Commit ef617230 authored by Amith Yamasani's avatar Amith Yamasani
Browse files

Go back to top of list when Settings is relaunched 

Also fixes slight movements when coming back from Add account.

Bug: 7312513
Bug: 7318452
Change-Id: I5b07262de52e6bdf98e75fff98a032afd74fc0e5
parent 2fc94035

src/com/android/settings/Settings.java

+8 −4
Original line number Diff line number Diff line
@@ -271,10 +271,12 @@ public class Settings extends PreferenceActivity 
        super.onNewIntent(intent);



        // If it is not launched from history, then reset to top-level

        if ((intent.getFlags() & Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY) == 0

                && mFirstHeader != null && !onIsHidingHeaders() && onIsMultiPane()) {

        if ((intent.getFlags() & Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY) == 0) {

            if (mFirstHeader != null && !onIsHidingHeaders() && onIsMultiPane()) {

                switchToHeaderLocal(mFirstHeader);

            }

            getListView().setSelectionFromTop(0, 0);

        }

    }



    private void highlightHeader(int id) {
@@ -282,10 +284,12 @@ public class Settings extends PreferenceActivity 
            Integer index = mHeaderIndexMap.get(id);

            if (index != null) {

                getListView().setItemChecked(index, true);

                if (isMultiPane()) {

                    getListView().smoothScrollToPosition(index);

                }

            }

        }

    }



    @Override

    public Intent getIntent() {