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

Commit 4428f750 authored by Sally Yuen's avatar Sally Yuen Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17183358

Change-Id: I761f7152cb0a0114711426747f1b2f9fdc9dbc46
parents 6a35ec73 eb8de052

core/api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -3901,7 +3901,7 @@ package android.animation { 
    method public Object getAnimatedValue(String);

    method public long getCurrentPlayTime();

    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 int getRepeatCount();

    method public int getRepeatMode();
@@ -3941,7 +3941,7 @@ package android.animation { 
  }















  public static interface ValueAnimator.DurationScaleChangeListener {













    method public void onChanged(float);













    method public void onChanged(@FloatRange(from=0) float);















  }





























}

























core/api/test-current.txt



+1
−1




























Original line number
Diff line number
Diff line








@@ -96,7 +96,7 @@ package android.accessibilityservice {













package android.animation {































  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);















  }































}

































core/java/android/animation/ValueAnimator.java



+4
−4




























Original line number
Diff line number
Diff line








@@ -316,7 +316,7 @@ public class ValueAnimator extends Animator implements AnimationHandler.Animatio













    @UnsupportedAppUsage















    @TestApi















    @MainThread













    public static void setDurationScale(@FloatRange(from = 0, to = 1) float durationScale) {













    public static void setDurationScale(@FloatRange(from = 0) float durationScale) {















        sDurationScale = durationScale;















        List<WeakReference<DurationScaleChangeListener>> listenerCopy;

























@@ -340,7 +340,7 @@ public class ValueAnimator extends Animator implements AnimationHandler.Animatio













     *















     * @return the duration scale.















     */













    @FloatRange(from = 0, to = 1)













    @FloatRange(from = 0)















    public static float getDurationScale() {















        return sDurationScale;















    }










@@ -1798,8 +1798,8 @@ public class ValueAnimator extends Animator implements AnimationHandler.Animatio













    public interface DurationScaleChangeListener {















        /**















         * 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);















    }















}