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

Commit 3fa058a5 authored by Android (Google) Code Review's avatar Android (Google) Code Review Committed by The Android Open Source Project
Browse files

am 36c153f8: Merge change 4535 into donut 

Merge commit '36c153f8'

* commit '36c153f8':
  Add title to nested preference screens.
parents abb01dba 36c153f8

core/java/android/preference/PreferenceScreen.java

+10 −2
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.content.DialogInterface; 
import android.os.Bundle;

import android.os.Parcel;

import android.os.Parcelable;

import android.text.TextUtils;

import android.util.AttributeSet;

import android.view.View;

import android.widget.Adapter;
@@ -147,8 +148,15 @@ public final class PreferenceScreen extends PreferenceGroup implements AdapterVi 
        ListView listView = new ListView(context);

        bind(listView);



        Dialog dialog = mDialog = new Dialog(context, com.android.internal.R.style.Theme_NoTitleBar);

        // Set the title bar if title is available, else no title bar

        final CharSequence title = getTitle();

        Dialog dialog = mDialog = new Dialog(context, !TextUtils.isEmpty(title)

                ? com.android.internal.R.style.Theme_NoTitleBar

                : com.android.internal.R.style.Theme);

        dialog.setContentView(listView);

        if (!TextUtils.isEmpty(title)) {

            dialog.setTitle(title);

        }

        dialog.setOnDismissListener(this);

        if (state != null) {

            dialog.onRestoreInstanceState(state);