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

Commit 7395cf10 authored by George Mount's avatar George Mount Committed by Android (Google) Code Review
Browse files

Merge changes from topic "revert-20986099-revert-20590670-animator_seeking-RVESPLGWYK-UCBFNOEOVV" 

* changes:
  Revert^2 "Animator start and stop notifications during seek"
  Revert^2 "Improve AnimatorSet seekability."
parents 983f301b d458cc3e

core/java/android/animation/Animator.java

+30 −3
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.compat.annotation.UnsupportedAppUsage; 
import android.content.pm.ActivityInfo.Config;

import android.content.res.ConstantState;

import android.os.Build;

import android.util.LongArray;



import java.util.ArrayList;
@@ -546,7 +547,6 @@ public abstract class Animator implements Cloneable { 
     */

    void skipToEndValue(boolean inReverse) {}





    /**

     * Internal use only.

     *
@@ -559,9 +559,36 @@ public abstract class Animator implements Cloneable { 
    }



    /**

     * Internal use only.

     * Internal use only. Changes the value of the animator as if currentPlayTime has passed since

     * the start of the animation. Therefore, currentPlayTime includes the start delay, and any

     * repetition. lastPlayTime is similar and is used to calculate how many repeats have been

     * done between the two times.

     */

    void animateValuesInRange(long currentPlayTime, long lastPlayTime, boolean notify) {}



    /**

     * Internal use only. This animates any animation that has ended since lastPlayTime.

     * If an animation hasn't been finished, no change will be made.

     */

    void animateSkipToEnds(long currentPlayTime, long lastPlayTime, boolean notify) {}



    /**

     * Internal use only. Adds all start times (after delay) to and end times to times.

     * The value must include offset.

     */

    void animateBasedOnPlayTime(long currentPlayTime, long lastPlayTime, boolean inReverse) {}

    void getStartAndEndTimes(LongArray times, long offset) {

        long startTime = offset + getStartDelay();

        if (times.indexOf(startTime) < 0) {

            times.add(startTime);

        }

        long duration = getTotalDuration();

        if (duration != DURATION_INFINITE) {

            long endTime = duration + offset;

            if (times.indexOf(endTime) < 0) {

                times.add(endTime);

            }

        }

    }



    /**

     * <p>An animation listener receives notifications from an animation.

core/java/android/animation/AnimatorSet.java

+266 −109

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/animation/ValueAnimator.java

+84 −34

File changed.

Preview size limit exceeded, changes collapsed.