commit 712dcc5a3c94d2935ea1f425a26eb4873d2aa8b8
author Wei Sheng Shih <wilsonshih@google.com> Thu May 09 00:50:26 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 09 00:50:26 2024 +0000
tree 0ee687efdb6ee27004fcc36139aedae0977a1054
parent 32390515f77e8d03bfb7e817dd4d87666f0b1000
parent 24d6ea8ec6731f4bedeae1e93714348b23ade7bf

Merge "Correct AnimationSet#getTransformationAt" into main

core/java/android/view/animation/AnimationSet.java

diff --git a/core/java/android/view/animation/AnimationSet.java b/core/java/android/view/animation/AnimationSet.java
index a2f3544..5aaa994 100644
--- a/core/java/android/view/animation/AnimationSet.java
+++ b/core/java/android/view/animation/AnimationSet.java
@@ -374,7 +374,7 @@
             final Animation a = mAnimations.get(i);
 
             temp.clear();
-            a.getTransformationAt(interpolatedTime, t);
+            a.getTransformationAt(interpolatedTime, temp);
             t.compose(temp);
         }
     }

core/java/android/view/animation/Transformation.java

diff --git a/core/java/android/view/animation/Transformation.java b/core/java/android/view/animation/Transformation.java
index de31667..812ecd1 100644
--- a/core/java/android/view/animation/Transformation.java
+++ b/core/java/android/view/animation/Transformation.java
@@ -78,6 +78,7 @@
         mHasClipRect = false;
         mAlpha = 1.0f;
         mTransformationType = TYPE_BOTH;
+        mInsets = Insets.NONE;
     }
 
     /**