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

Commit 203cdd3f authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove PointerIcon frame size checks for animated drawables" into main

parents e79e6600 14406149
Loading
Loading
Loading
Loading
+0 −5
Original line number Diff line number Diff line
@@ -540,8 +540,6 @@ public final class PointerIcon implements Parcelable {
                // Assumes they have the exact duration.
                mDurationPerFrame = animationDrawable.getDuration(0);
                mBitmapFrames = new Bitmap[frames - 1];
                final int width = drawable.getIntrinsicWidth();
                final int height = drawable.getIntrinsicHeight();
                final boolean isVectorAnimation = drawable instanceof VectorDrawable;
                mDrawNativeDropShadow = isVectorAnimation;
                for (int i = 1; i < frames; ++i) {
@@ -556,9 +554,6 @@ public final class PointerIcon implements Parcelable {
                                + "is a different type from the others. All frames should be the "
                                + "same type.");
                    }
                    // TODO(b/361232935): Check when bitmap size of the ith frame is different
                    // drawableFrame.getIntrinsicWidth() != width ||
                    // drawableFrame.getIntrinsicHeight() != height
                    if (isVectorAnimation) {
                        drawableFrame = getBitmapDrawableFromVectorDrawable(resources,
                                (VectorDrawable) drawableFrame, pointerScale);