Ensure preference icon is returned when inflated from XML even if it has not been displayed yet.

Bug: 31343032 Change-Id: Ifa2c84b3091c2cfc5b98da6f30bb1ba060cd26e7
2016-09-07 13:15:55 -07:00
parent f816ac2fa9
commit f049e24c64
1 changed files with 3 additions and 0 deletions
--- 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;
    }