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

Commit 6b5e5937 authored by Chet Haase's avatar Chet Haase Committed by Android (Google) Code Review
Browse files

Merge "Fix when >2 keyframes supplied"

parents 773a9c5c 750e12e1

core/java/android/animation/FloatKeyframeSet.java

+3 −3
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ class FloatKeyframeSet extends KeyframeSet { 
            }

            float intervalFraction = (fraction - prevFraction) / (nextFraction - prevFraction);

            return mEvaluator == null ?

                    prevValue + fraction * (nextValue - prevValue) :

                    prevValue + intervalFraction * (nextValue - prevValue) :

                    ((Number)mEvaluator.evaluate(intervalFraction, prevValue, nextValue)).

                            floatValue();

        } else if (fraction >= 1f) {
@@ -103,7 +103,7 @@ class FloatKeyframeSet extends KeyframeSet { 
            }

            float intervalFraction = (fraction - prevFraction) / (nextFraction - prevFraction);

            return mEvaluator == null ?

                    prevValue + fraction * (nextValue - prevValue) :

                    prevValue + intervalFraction * (nextValue - prevValue) :

                    ((Number)mEvaluator.evaluate(intervalFraction, prevValue, nextValue)).

                            floatValue();

        }
@@ -120,7 +120,7 @@ class FloatKeyframeSet extends KeyframeSet { 
                float prevValue = prevKeyframe.getFloatValue();

                float nextValue = nextKeyframe.getFloatValue();

                return mEvaluator == null ?

                        prevValue + fraction * (nextValue - prevValue) :

                        prevValue + intervalFraction * (nextValue - prevValue) :

                        ((Number)mEvaluator.evaluate(intervalFraction, prevValue, nextValue)).

                            floatValue();

            }

core/java/android/animation/IntKeyframeSet.java

+3 −3
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ class IntKeyframeSet extends KeyframeSet { 
            }

            float intervalFraction = (fraction - prevFraction) / (nextFraction - prevFraction);

            return mEvaluator == null ?

                    prevValue + (int)(fraction * (nextValue - prevValue)) :

                    prevValue + (int)(intervalFraction * (nextValue - prevValue)) :

                    ((Number)mEvaluator.evaluate(intervalFraction, prevValue, nextValue)).

                            intValue();

        } else if (fraction >= 1f) {
@@ -103,7 +103,7 @@ class IntKeyframeSet extends KeyframeSet { 
            }

            float intervalFraction = (fraction - prevFraction) / (nextFraction - prevFraction);

            return mEvaluator == null ?

                    prevValue + (int)(fraction * (nextValue - prevValue)) :

                    prevValue + (int)(intervalFraction * (nextValue - prevValue)) :

                    ((Number)mEvaluator.evaluate(intervalFraction, prevValue, nextValue)).intValue();

        }

        IntKeyframe prevKeyframe = (IntKeyframe) mKeyframes.get(0);
@@ -119,7 +119,7 @@ class IntKeyframeSet extends KeyframeSet { 
                int prevValue = prevKeyframe.getIntValue();

                int nextValue = nextKeyframe.getIntValue();

                return mEvaluator == null ?

                        prevValue + (int)(fraction * (nextValue - prevValue)) :

                        prevValue + (int)(intervalFraction * (nextValue - prevValue)) :

                        ((Number)mEvaluator.evaluate(intervalFraction, prevValue, nextValue)).

                                intValue();

            }