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

Commit a2df5792 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fall back when failing to load size restricted icon" into tm-dev am: 44df60c3 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17366541



Change-Id: I71097c1087e7da2e78aa41f5937497a75bcc783d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 15a39748 44df60c3

core/java/com/android/internal/widget/CachingIconView.java

+4 −1
Original line number Diff line number Diff line
@@ -122,8 +122,11 @@ public class CachingIconView extends ImageView { 
    public Runnable setImageIconAsync(@Nullable final Icon icon) {

        resetCache();

        Drawable drawable = loadSizeRestrictedIcon(icon);

        if (drawable != null) {

            return () -> setImageDrawable(drawable);

        }

        return super.setImageIconAsync(icon);

    }



    @Override

    @RemotableViewMethod(asyncImpl="setImageResourceAsync")