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

Commit 26ae3286 authored by Svetoslav's avatar Svetoslav Committed by Android Git Automerger
Browse files

am ebda68bf: am 52dedb89: am 512c722f: Merge "PreferencesFragment showing the... 

am ebda68bf: am 52dedb89: am 512c722f: Merge "PreferencesFragment showing the breadcrumb area in single pane mode." into klp-dev

* commit 'ebda68bf':
  PreferencesFragment showing the breadcrumb area in single pane mode.
parents 034d9e94 ebda68bf

core/java/android/preference/PreferenceActivity.java

+6 −6
Original line number Diff line number Diff line
@@ -521,7 +521,9 @@ public abstract class PreferenceActivity extends ListActivity implements 
        int initialTitle = getIntent().getIntExtra(EXTRA_SHOW_FRAGMENT_TITLE, 0);

        int initialShortTitle = getIntent().getIntExtra(EXTRA_SHOW_FRAGMENT_SHORT_TITLE, 0);



        if (savedInstanceState != null) {

        // Restore from headers only if they are supported which

        // is in multi-pane mode.

        if (savedInstanceState != null && !mSinglePane) {

            // We are restarting from a previous saved state; used that to

            // initialize, instead of starting fresh.

            ArrayList<Header> headers = savedInstanceState.getParcelableArrayList(HEADERS_TAG);
@@ -573,14 +575,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);

            CharSequence initialTitleStr = null;

            CharSequence initialShortTitleStr = null;

            if (initialTitle != 0) {

                initialTitleStr = getText(initialTitle);

                initialShortTitleStr = initialShortTitle != 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) {