diff options
| author | 2024-09-10 22:34:55 +0000 | |
|---|---|---|
| committer | 2024-09-10 22:34:55 +0000 | |
| commit | 203cdd3ff83b705703426953238e6c968150eef6 (patch) | |
| tree | 21bc2cd633df1727c9df747d070dba94942145c7 | |
| parent | e79e6600802391af12517ee2fb884cb2e5c570d2 (diff) | |
| parent | 14406149022cde05386523402c4edbc15ee00902 (diff) | |
Merge "Remove PointerIcon frame size checks for animated drawables" into main
| -rw-r--r-- | core/java/android/view/PointerIcon.java | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/core/java/android/view/PointerIcon.java b/core/java/android/view/PointerIcon.java index 815fd1c49a38..dd950e83dd52 100644 --- a/core/java/android/view/PointerIcon.java +++ b/core/java/android/view/PointerIcon.java @@ -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); |