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

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

Merge "Fix shift/mask error in ArtbEvaluator" into jb-mr1-dev

parents 4aa3c034 9b559989

core/java/android/animation/ArgbEvaluator.java

+2 −2
Original line number Diff line number Diff line
@@ -40,13 +40,13 @@ public class ArgbEvaluator implements TypeEvaluator { 
     */

    public Object evaluate(float fraction, Object startValue, Object endValue) {

        int startInt = (Integer) startValue;

        int startA = (startInt >> 24);

        int startA = (startInt >> 24) & 0xff;

        int startR = (startInt >> 16) & 0xff;

        int startG = (startInt >> 8) & 0xff;

        int startB = startInt & 0xff;



        int endInt = (Integer) endValue;

        int endA = (endInt >> 24);

        int endA = (endInt >> 24) & 0xff;

        int endR = (endInt >> 16) & 0xff;

        int endG = (endInt >> 8) & 0xff;

        int endB = endInt & 0xff;