drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "PreferencesFragment showing the breadcrumb area in single pane mode." into klp-dev

Browse Source
This commit is contained in:
Svetoslav
2013-11-12 04:01:16 +00:00
committed by Android (Google) Code Review
parent 596e409ec9 2b8795a9db
commit 512c722f14
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,7 +521,9 @@ public abstract class PreferenceActivity extends ListActivity implements
int initialTitle = getIntent().getIntExtra(EXTRA_SHOW_FRAGMENT_TITLE, 0); int initialTitle = getIntent().getIntExtra(EXTRA_SHOW_FRAGMENT_TITLE, 0);
int initialShortTitle = getIntent().getIntExtra(EXTRA_SHOW_FRAGMENT_SHORT_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 // We are restarting from a previous saved state; used that to
// initialize, instead of starting fresh. // initialize, instead of starting fresh.
ArrayList<Header> headers = savedInstanceState.getParcelableArrayList(HEADERS_TAG); 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. // Single pane, showing just a prefs fragment.
findViewById(com.android.internal.R.id.headers).setVisibility(View.GONE); findViewById(com.android.internal.R.id.headers).setVisibility(View.GONE);
mPrefsContainer.setVisibility(View.VISIBLE); mPrefsContainer.setVisibility(View.VISIBLE);
CharSequence initialTitleStr = null;
CharSequence initialShortTitleStr = null;
if (initialTitle != 0) { if (initialTitle != 0) {
initialTitleStr = getText(initialTitle); CharSequence initialTitleStr = getText(initialTitle);
initialShortTitleStr = initialShortTitle != 0 CharSequence initialShortTitleStr = initialShortTitle != 0
? getText(initialShortTitle) : null; ? getText(initialShortTitle) : null;
}
showBreadCrumbs(initialTitleStr, initialShortTitleStr); showBreadCrumbs(initialTitleStr, initialShortTitleStr);
}
} else if (mHeaders.size() > 0) { } else if (mHeaders.size() > 0) {
setListAdapter(new HeaderAdapter(this, mHeaders)); setListAdapter(new HeaderAdapter(this, mHeaders));
if (!mSinglePane) { if (!mSinglePane) {