commit | f049e24c644912a308ca283ba1c75d678a09f4a8 | [log] [tgz] |
---|---|---|
author | Michael Kwan <mkwan@google.com> | Wed Sep 07 13:15:55 2016 -0700 |
committer | Michael Kwan <mkwan@google.com> | Wed Sep 07 13:15:55 2016 -0700 |
tree | 5f704c5d25ca83e14a50e34a8af0f822627027d8 | |
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
diff --git a/core/java/android/preference/Preference.java b/core/java/android/preference/Preference.java index b1cad05..ec1e102 100644 --- a/core/java/android/preference/Preference.java +++ b/core/java/android/preference/Preference.java
@@ -719,6 +719,9 @@ * @see #setIcon(Drawable) */ public Drawable getIcon() { + if (mIcon == null && mIconResId != 0) { + mIcon = getContext().getDrawable(mIconResId); + } return mIcon; }