Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8fc552e6 authored by Svetoslav Ganov's avatar Svetoslav Ganov
Browse files

Revert "PreferenceFragment showing the breadcrumb when not needed." 

This reverts commit 7db97b0a.

Change-Id: Iefe9807fd75baf04e61ec59b508e438320c80fe3
parent 7db97b0a

core/java/android/preference/PreferenceActivity.java

+6 −5
Original line number Diff line number Diff line
@@ -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);

            }

        } else if (mHeaders.size() > 0) {

            setListAdapter(new HeaderAdapter(this, mHeaders));

            if (!mSinglePane) {