Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 02014a62 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Ensure preference icon is returned when inflated from XML even if it... 

Merge "Ensure preference icon is returned when inflated from XML even if it has not been displayed yet." into cw-f-dev
parents d026b446 f049e24c

core/java/android/preference/Preference.java

+3 −0
Original line number Diff line number Diff line
@@ -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;

    }