diff options
| author | Michael Kwan <mkwan@google.com> | 2016-09-07 13:15:55 -0700 |
|---|---|---|
| committer | Michael Kwan <mkwan@google.com> | 2016-09-07 13:15:55 -0700 |
| commit | f049e24c644912a308ca283ba1c75d678a09f4a8 (patch) | |
| tree | 5f704c5d25ca83e14a50e34a8af0f822627027d8 /core/java/android/preference/Preference.java | |
| parent | f816ac2fa99dec8a8298d8a232d943cb290570b1 (diff) | |
Ensure preference icon is returned when inflated from XML even if it has not been displayed yet.
Bug: 31343032
Change-Id: Ifa2c84b3091c2cfc5b98da6f30bb1ba060cd26e7
Diffstat (limited to 'core/java/android/preference/Preference.java')
| -rw-r--r-- | core/java/android/preference/Preference.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/preference/Preference.java b/core/java/android/preference/Preference.java index b1cad0538d31..ec1e102c9289 100644 --- a/core/java/android/preference/Preference.java +++ b/core/java/android/preference/Preference.java @@ -719,6 +719,9 @@ public class Preference implements Comparable<Preference> { * @see #setIcon(Drawable) */ public Drawable getIcon() { + if (mIcon == null && mIconResId != 0) { + mIcon = getContext().getDrawable(mIconResId); + } return mIcon; } |