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

Commit e97cac49 authored by David Stevens's avatar David Stevens Committed by Android (Google) Code Review
Browse files

Merge "Fix calculation of duration in AnimationSet"

parents e19589fb ab9e3b53

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

+1 −1
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ public class AnimationSet extends Animation { 
                mDuration = a.getStartOffset() + a.getDuration();

                mLastEnd = mStartOffset + mDuration;

            } else {

                mLastEnd = Math.max(mLastEnd, a.getStartOffset() + a.getDuration());

                mLastEnd = Math.max(mLastEnd, mStartOffset + a.getStartOffset() + a.getDuration());

                mDuration = mLastEnd - mStartOffset;

            }

        }