From 68e7f13e2259d290d8e40839427f8d8de66eafd3 Mon Sep 17 00:00:00 2001 From: Svetoslav Ganov Date: Thu, 21 Nov 2013 19:33:53 +0000 Subject: [PATCH] Revert "PreferencesFragment showing the breadcrumb area in single pane mode." This reverts commit 2b8795a9db2d494c38d34fd113a9153880a555c0. Change-Id: If8dcc7190cbe66af09945d8b23a3e1d8fd791b1d --- core/java/android/preference/PreferenceActivity.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/core/java/android/preference/PreferenceActivity.java b/core/java/android/preference/PreferenceActivity.java index 7ddfa874155bf..ed9264aa92036 100644 --- a/core/java/android/preference/PreferenceActivity.java +++ b/core/java/android/preference/PreferenceActivity.java @@ -521,9 +521,7 @@ 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); - // Restore from headers only if they are supported which - // is in multi-pane mode. - if (savedInstanceState != null && !mSinglePane) { + if (savedInstanceState != null) { // We are restarting from a previous saved state; used that to // initialize, instead of starting fresh. ArrayList
headers = savedInstanceState.getParcelableArrayList(HEADERS_TAG); @@ -575,12 +573,14 @@ 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) { - CharSequence initialTitleStr = getText(initialTitle); - CharSequence initialShortTitleStr = initialShortTitle != 0 + initialTitleStr = getText(initialTitle); + initialShortTitleStr = initialShortTitle != 0 ? getText(initialShortTitle) : null; - showBreadCrumbs(initialTitleStr, initialShortTitleStr); } + showBreadCrumbs(initialTitleStr, initialShortTitleStr); } else if (mHeaders.size() > 0) { setListAdapter(new HeaderAdapter(this, mHeaders)); if (!mSinglePane) {