Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 4ed5f502: am 4d159661: Merge "Revert "PreferencesFragment showing the breadcrumb area in single pane mode."" into klp-dev

Browse Source 
* commit '4ed5f502a748fc351025346b04d50a5fae2a3bef':
  Revert "PreferencesFragment showing the breadcrumb area in single pane mode."
This commit is contained in:
Svetoslav Ganov
2013-11-21 12:19:02 -08:00
committed by Android Git Automerger
parent 3eddb6213d 4ed5f502a7
commit dbab7e1794
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/preference/PreferenceActivity.java
View File

@@ -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<Header> 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) {