Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Chet Haase
2012-08-09 14:52:25 -07:00
committed by Android (Google) Code Review
parent 4aa3c034f5 9b5599894b
commit 4e44348f91
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/animation/ArgbEvaluator.java
View File

@@ -40,13 +40,13 @@ public class ArgbEvaluator implements TypeEvaluator {
*/ */
public Object evaluate(float fraction, Object startValue, Object endValue) { public Object evaluate(float fraction, Object startValue, Object endValue) {
int startInt = (Integer) startValue; int startInt = (Integer) startValue;
int startA = (startInt >> 24); int startA = (startInt >> 24) & 0xff;
int startR = (startInt >> 16) & 0xff; int startR = (startInt >> 16) & 0xff;
int startG = (startInt >> 8) & 0xff; int startG = (startInt >> 8) & 0xff;
int startB = startInt & 0xff; int startB = startInt & 0xff;
int endInt = (Integer) endValue; int endInt = (Integer) endValue;
int endA = (endInt >> 24); int endA = (endInt >> 24) & 0xff;
int endR = (endInt >> 16) & 0xff; int endR = (endInt >> 16) & 0xff;
int endG = (endInt >> 8) & 0xff; int endG = (endInt >> 8) & 0xff;
int endB = endInt & 0xff; int endB = endInt & 0xff;