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

Commit 045e5a78 authored by Doris Liu's avatar Doris Liu Committed by Android (Google) Code Review
Browse files

Merge "Ensure animator's interpolator is set" into nyc-dev

parents 26b27543 148f57fc

libs/hwui/Animator.cpp

+4 −4
Original line number Diff line number Diff line
@@ -160,6 +160,10 @@ void BaseRenderNodeAnimator::pushStaging(AnimationContext& context) { 
    }



    if (!mStagingRequests.empty()) {

        // No interpolator was set, use the default

        if (mPlayState == PlayState::NotStarted && !mInterpolator) {

            mInterpolator.reset(Interpolator::createDefaultInterpolator());

        }

        // Keep track of the play state and play time before they are changed when

        // staging requests are resolved.

        nsecs_t currentPlayTime = mPlayTime;
@@ -222,10 +226,6 @@ void BaseRenderNodeAnimator::transitionToRunning(AnimationContext& context) { 
        // Set to 0 so that the animate() basically instantly finishes

        mStartTime = 0;

    }

    // No interpolator was set, use the default

    if (!mInterpolator) {

        mInterpolator.reset(Interpolator::createDefaultInterpolator());

    }

    if (mDuration < 0 || mDuration > 50000) {

        ALOGW("Your duration is strange and confusing: %" PRId64, mDuration);

    }