Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fall back when failing to load size restricted icon" into tm-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-03-29 23:33:39 +00:00
committed by Android (Google) Code Review
parent 68eab3f162 e764041142
commit 44df60c3f9
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/com/android/internal/widget/CachingIconView.java
View File

@@ -122,7 +122,10 @@ public class CachingIconView extends ImageView {
public Runnable setImageIconAsync(@Nullable final Icon icon) { public Runnable setImageIconAsync(@Nullable final Icon icon) {
resetCache(); resetCache();
Drawable drawable = loadSizeRestrictedIcon(icon); Drawable drawable = loadSizeRestrictedIcon(icon);
return () -> setImageDrawable(drawable); if (drawable != null) {
return () -> setImageDrawable(drawable);
}
return super.setImageIconAsync(icon);
} }
@Override @Override