summaryrefslogtreecommitdiff
path: root/src/com/android/bitmap/drawable/TileDrawable.java
diff options
context:
space:
mode:
authorMark Wei <markwei@google.com>2013-11-22 20:25:08 -0800
committerMark Wei <markwei@google.com>2013-11-22 20:25:08 -0800
commitdf3da61c8f2f54604376d9761649bdba54aa858b (patch)
tree672989f2cd2dd47ad830dcdc7072eddafb2cac21 /src/com/android/bitmap/drawable/TileDrawable.java
parentcd728097ff189542877a2952879a3aa3c6cb5666 (diff)
downloadbitmap-df3da61c8f2f54604376d9761649bdba54aa858b.tar.gz
Background color of TileDrawable must be opaque.
Change-Id: I6ac7b4ba6f68181424064377464e1896c2129f13
Diffstat (limited to 'src/com/android/bitmap/drawable/TileDrawable.java')
-rw-r--r--src/com/android/bitmap/drawable/TileDrawable.java14
1 files changed, 2 insertions, 12 deletions
diff --git a/src/com/android/bitmap/drawable/TileDrawable.java b/src/com/android/bitmap/drawable/TileDrawable.java
index 485e7ca..42400b4 100644
--- a/src/com/android/bitmap/drawable/TileDrawable.java
+++ b/src/com/android/bitmap/drawable/TileDrawable.java
@@ -19,7 +19,6 @@ package com.android.bitmap.drawable;
import android.animation.ValueAnimator;
import android.animation.ValueAnimator.AnimatorUpdateListener;
import android.graphics.Canvas;
-import android.graphics.Color;
import android.graphics.ColorFilter;
import android.graphics.Paint;
import android.graphics.Rect;
@@ -91,13 +90,10 @@ public class TileDrawable extends Drawable implements Drawable.Callback {
if (!isVisible() && mPaint.getAlpha() == 0) {
return;
}
- // Save paint alpha.
final int alpha = mPaint.getAlpha();
- mPaint.setColor(getColorWithAlpha(mOpts.backgroundColor, alpha));
- canvas.drawRect(getBounds(), mPaint);
- // Restore paint alpha.
+ mPaint.setColor(mOpts.backgroundColor);
mPaint.setAlpha(alpha);
-
+ canvas.drawRect(getBounds(), mPaint);
if (mInner != null) mInner.draw(canvas);
}
@@ -180,10 +176,4 @@ public class TileDrawable extends Drawable implements Drawable.Callback {
public void unscheduleDrawable(Drawable who, Runnable what) {
unscheduleSelf(what);
}
-
- private static int getColorWithAlpha(int color, int alpha) {
- float fade = alpha / 255f;
- return Color.argb((int) (fade * Color.alpha(color)), Color.red(color), Color.green(color),
- Color.blue(color));
- }
}