Merge "PreferenceFragment showing the breadcrumb when not needed." into klp-dev (517220b4) · Commits · e / os / android_frameworks_base

core/java/android/preference/PreferenceActivity.java

+5 −6

Original line number	Diff line number	Diff line
		@@ -33,7 +33,6 @@ import android.os.Parcel;
		import android.os.Parcelable;
		import android.text.TextUtils;
		import android.util.AttributeSet;
		import android.util.Log;
		import android.util.TypedValue;
		import android.util.Xml;
		import android.view.LayoutInflater;
		@@ -125,8 +124,6 @@ public abstract class PreferenceActivity extends ListActivity implements
		PreferenceManager.OnPreferenceTreeClickListener,
		PreferenceFragment.OnPreferenceStartFragmentCallback {

		private static final String TAG = "PreferenceActivity";

		// Constants for state save/restore
		private static final String HEADERS_TAG = ":android:headers";
		private static final String CUR_HEADER_TAG = ":android:cur_header";
		@@ -576,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) {