diff options
| author | Alan Viverette <alanv@google.com> | 2014-10-22 00:45:34 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-10-22 00:45:34 +0000 |
| commit | 36a132c0a0adfd15b20c3e269d7647c050cd84aa (patch) | |
| tree | 1d1f4041e4410a9ebea9a5863ce3a9a60e40927c /core/java | |
| parent | 639e3181e0c3bb7fae5e05ef9edde729a67e2ac5 (diff) | |
| parent | c4a12a7ad0d6eef723b65c256cd77570b2177a28 (diff) | |
| download | frameworks_base-36a132c0a0adfd15b20c3e269d7647c050cd84aa.zip frameworks_base-36a132c0a0adfd15b20c3e269d7647c050cd84aa.tar.gz frameworks_base-36a132c0a0adfd15b20c3e269d7647c050cd84aa.tar.bz2 | |
am bb852b0b: Merge "Format ListPreference summary with empty string if entry is null" into lmp-mr1-dev
automerge: c4a12a7
* commit 'c4a12a7ad0d6eef723b65c256cd77570b2177a28':
Format ListPreference summary with empty string if entry is null
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/preference/ListPreference.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/preference/ListPreference.java b/core/java/android/preference/ListPreference.java index 8081a54..9482a72 100644 --- a/core/java/android/preference/ListPreference.java +++ b/core/java/android/preference/ListPreference.java @@ -162,10 +162,10 @@ public class ListPreference extends DialogPreference { @Override public CharSequence getSummary() { final CharSequence entry = getEntry(); - if (mSummary == null || entry == null) { + if (mSummary == null) { return super.getSummary(); } else { - return String.format(mSummary, entry); + return String.format(mSummary, entry == null ? "" : entry); } } |