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

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

Merge "Fix crash when trying to load SystemShortcut drawable." into ub-launcher3-master

parents e8692ecc 93e0594b
Loading
Loading
Loading
Loading
+5 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import android.os.Looper;
import android.view.View;
import android.view.ViewGroup;
import android.view.ViewOutlineProvider;
import android.widget.ImageView;

import com.android.launcher3.BubbleTextView;
import com.android.launcher3.InsettableFrameLayout.LayoutParams;
@@ -48,6 +49,7 @@ import com.android.launcher3.folder.FolderIcon;
import com.android.launcher3.folder.FolderShape;
import com.android.launcher3.graphics.ShiftedBitmapDrawable;
import com.android.launcher3.icons.LauncherIcons;
import com.android.launcher3.popup.SystemShortcut;

import androidx.annotation.Nullable;
import androidx.annotation.WorkerThread;
@@ -196,6 +198,9 @@ public class FloatingIconView extends View implements Animator.AnimatorListener,
            // Similar to DragView, we simply use the BubbleTextView icon here.
            mDrawable = ((BubbleTextView) v).getIcon();
        }
        if (v instanceof ImageView && info instanceof SystemShortcut) {
            mDrawable = ((ImageView) v).getDrawable();
        }
        if (mDrawable == null) {
            mDrawable = Utilities.getFullDrawable(launcher, info, lp.width, lp.height,
                    useDrawableAsIs, new Object[1]);