diff options
| author | Amith Yamasani <yamasani@google.com> | 2009-06-29 20:17:53 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-06-29 20:17:53 -0700 |
| commit | 08bc0d51a0088405c89c28252fa8e9e790a52233 (patch) | |
| tree | a9cfde2bd8312d35eb4b211f836a53dec35fb291 /core/java/android/preference | |
| parent | f9435d7521a7085e487974faefbc7934bf90753c (diff) | |
| parent | a013a98f93fd5ced58cf76dcc2bd6ab2ca95dd92 (diff) | |
| download | frameworks_base-08bc0d51a0088405c89c28252fa8e9e790a52233.zip frameworks_base-08bc0d51a0088405c89c28252fa8e9e790a52233.tar.gz frameworks_base-08bc0d51a0088405c89c28252fa8e9e790a52233.tar.bz2 | |
am a013a98f: Fix the nested preferences title. Again.
Merge commit 'a013a98f93fd5ced58cf76dcc2bd6ab2ca95dd92'
* commit 'a013a98f93fd5ced58cf76dcc2bd6ab2ca95dd92':
Fix the nested preferences title. Again.
Diffstat (limited to 'core/java/android/preference')
| -rw-r--r-- | core/java/android/preference/PreferenceScreen.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/preference/PreferenceScreen.java b/core/java/android/preference/PreferenceScreen.java index 6ea2528..95e5432 100644 --- a/core/java/android/preference/PreferenceScreen.java +++ b/core/java/android/preference/PreferenceScreen.java @@ -150,7 +150,7 @@ 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) + 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); |