diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2013-11-21 19:36:22 +0000 |
|---|---|---|
| committer | The Android Automerger <android-build@google.com> | 2013-11-21 20:29:42 -0800 |
| commit | c4294fbb7b70870fea1b33c370a5e90b23e54d4b (patch) | |
| tree | 6bd703a6eb722369010ad6974ed5afe4e2a57301 | |
| parent | cacd6728f6f85ec15ba3fdb0d4bbb6e2f7d69ce1 (diff) | |
| download | base-c4294fbb7b70870fea1b33c370a5e90b23e54d4b.tar.gz | |
Revert "PreferenceFragment showing the breadcrumb when not needed."
This reverts commit 7db97b0a29c613afb78c2734bf2504324a71963d.
Change-Id: Iefe9807fd75baf04e61ec59b508e438320c80fe3
| -rw-r--r-- | core/java/android/preference/PreferenceActivity.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/core/java/android/preference/PreferenceActivity.java b/core/java/android/preference/PreferenceActivity.java index ed9264aa9203..2ab5a91a7013 100644 --- a/core/java/android/preference/PreferenceActivity.java +++ b/core/java/android/preference/PreferenceActivity.java @@ -33,6 +33,7 @@ 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; @@ -124,6 +125,8 @@ 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"; @@ -573,14 +576,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); } - showBreadCrumbs(initialTitleStr, initialShortTitleStr); } else if (mHeaders.size() > 0) { setListAdapter(new HeaderAdapter(this, mHeaders)); if (!mSinglePane) { |