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

Commit 34905a98 authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

Fix issue #5021385: Title of any Settings subscreen changes... 

...to "Settings" when orientation changes

Change-Id: Ib6387b9813329174013452bcdf323cedc4b29664
parent 040c2f91

core/java/android/preference/PreferenceActivity.java

+10 −0
Original line number Diff line number Diff line
@@ -563,6 +563,12 @@ public abstract class PreferenceActivity extends ListActivity implements 
            // Single pane, showing just a prefs fragment.

            findViewById(com.android.internal.R.id.headers).setVisibility(View.GONE);

            mPrefsContainer.setVisibility(View.VISIBLE);

            if (initialTitle != 0) {

                CharSequence initialTitleStr = getText(initialTitle);

                CharSequence initialShortTitleStr = initialShortTitle != 0

                        ? getText(initialShortTitle) : null;

                showBreadCrumbs(initialTitleStr, initialShortTitleStr);

            }

        } else if (mHeaders.size() > 0) {

            setListAdapter(new HeaderAdapter(this, mHeaders));

            if (!mSinglePane) {
@@ -1093,6 +1099,10 @@ public abstract class PreferenceActivity extends ListActivity implements 
        } else {

            getListView().clearChoices();

        }

        showBreadCrumbs(header);

    }



    void showBreadCrumbs(Header header) {

        if (header != null) {

            CharSequence title = header.getBreadCrumbTitle(getResources());

            if (title == null) title = header.getTitle(getResources());