diff options
| author | Amith Yamasani <yamasani@google.com> | 2011-09-23 10:43:40 -0700 |
|---|---|---|
| committer | Amith Yamasani <yamasani@google.com> | 2011-09-23 10:43:40 -0700 |
| commit | 72e6bece43ca2778d8101a6d4dede2a12e0d47e8 (patch) | |
| tree | dcf8dd0db17fbb5f970c387f81a0b652c00c6729 /core | |
| parent | 94097b44b86f15d2581af5f3df21b5afcab27d01 (diff) | |
| download | frameworks_base-72e6bece43ca2778d8101a6d4dede2a12e0d47e8.zip frameworks_base-72e6bece43ca2778d8101a6d4dede2a12e0d47e8.tar.gz frameworks_base-72e6bece43ca2778d8101a6d4dede2a12e0d47e8.tar.bz2 | |
Launch nested preferences with the same theme as parent activity.
Bug: 5351628
Change-Id: Id67b81558bc6e010d6f024cdb8117424aa6b62f0
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/preference/PreferenceScreen.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/core/java/android/preference/PreferenceScreen.java b/core/java/android/preference/PreferenceScreen.java index 45e3a4c..dd9dd25 100644 --- a/core/java/android/preference/PreferenceScreen.java +++ b/core/java/android/preference/PreferenceScreen.java @@ -25,6 +25,7 @@ import android.os.Parcelable; import android.text.TextUtils; import android.util.AttributeSet; import android.view.View; +import android.view.Window; import android.widget.Adapter; import android.widget.AdapterView; import android.widget.ListAdapter; @@ -156,13 +157,13 @@ public final class PreferenceScreen extends PreferenceGroup implements AdapterVi // 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(mListView); - if (!TextUtils.isEmpty(title)) { + Dialog dialog = mDialog = new Dialog(context, context.getThemeResId()); + if (TextUtils.isEmpty(title)) { + dialog.getWindow().requestFeature(Window.FEATURE_NO_TITLE); + } else { dialog.setTitle(title); } + dialog.setContentView(mListView); dialog.setOnDismissListener(this); if (state != null) { dialog.onRestoreInstanceState(state); |