Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add @FloatRange to DurationScaleChangeListener.onChanged" into tm-dev

Browse Source
This commit is contained in:
Sally Yuen
2022-03-15 02:24:55 +00:00
committed by Android (Google) Code Review
parent cc1d5178d2 e85fe22d45
commit eb8de05259
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/api/current.txt
View File

@@ -3901,7 +3901,7 @@ package android.animation {
method public Object getAnimatedValue(String); method public Object getAnimatedValue(String);
method public long getCurrentPlayTime(); method public long getCurrentPlayTime();
method public long getDuration(); method public long getDuration();
method @FloatRange(from=0, to=1) public static float getDurationScale(); method @FloatRange(from=0) public static float getDurationScale();
method public static long getFrameDelay(); method public static long getFrameDelay();
method public int getRepeatCount(); method public int getRepeatCount();
method public int getRepeatMode(); method public int getRepeatMode();
@@ -3941,7 +3941,7 @@ package android.animation {
} }
public static interface ValueAnimator.DurationScaleChangeListener { public static interface ValueAnimator.DurationScaleChangeListener {
method public void onChanged(float); method public void onChanged(@FloatRange(from=0) float);
} }
} }

2
core/api/test-current.txt
View File

@@ -96,7 +96,7 @@ package android.accessibilityservice {
package android.animation { package android.animation {
public class ValueAnimator extends android.animation.Animator { public class ValueAnimator extends android.animation.Animator {
method @MainThread public static void setDurationScale(@FloatRange(from=0, to=1) float); method @MainThread public static void setDurationScale(@FloatRange(from=0) float);
} }
} }

8
core/java/android/animation/ValueAnimator.java
View File

@@ -316,7 +316,7 @@ public class ValueAnimator extends Animator implements AnimationHandler.Animatio
@UnsupportedAppUsage @UnsupportedAppUsage
@TestApi @TestApi
@MainThread @MainThread
public static void setDurationScale(@FloatRange(from = 0, to = 1) float durationScale) { public static void setDurationScale(@FloatRange(from = 0) float durationScale) {
sDurationScale = durationScale; sDurationScale = durationScale;
List<WeakReference<DurationScaleChangeListener>> listenerCopy; List<WeakReference<DurationScaleChangeListener>> listenerCopy;
@@ -340,7 +340,7 @@ public class ValueAnimator extends Animator implements AnimationHandler.Animatio
* *
* @return the duration scale. * @return the duration scale.
*/ */
@FloatRange(from = 0, to = 1) @FloatRange(from = 0)
public static float getDurationScale() { public static float getDurationScale() {
return sDurationScale; return sDurationScale;
} }
@@ -1798,8 +1798,8 @@ public class ValueAnimator extends Animator implements AnimationHandler.Animatio
public interface DurationScaleChangeListener { public interface DurationScaleChangeListener {
/** /**
* Called when the duration scale changes. * Called when the duration scale changes.
* @param scale the duration scalel * @param scale the duration scale
*/ */
void onChanged(float scale); void onChanged(@FloatRange(from = 0) float scale);
} }
} }