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

am: f049e24c64 Change-Id: Iab0a315f916fe7da2b2a523f364be5a6842aadbd
2016-09-07 22:15:53 +00:00
parent 4bb151c248 f049e24c64
commit 09ba4a4b78
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;
    }