diff options
Diffstat (limited to 'library/main/src/com/android/setupwizardlib')
-rw-r--r-- | library/main/src/com/android/setupwizardlib/GlifPatternDrawable.java | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/library/main/src/com/android/setupwizardlib/GlifPatternDrawable.java b/library/main/src/com/android/setupwizardlib/GlifPatternDrawable.java index 51c1a49..c1d968a 100644 --- a/library/main/src/com/android/setupwizardlib/GlifPatternDrawable.java +++ b/library/main/src/com/android/setupwizardlib/GlifPatternDrawable.java @@ -23,7 +23,6 @@ import android.graphics.Bitmap; import android.graphics.Canvas; import android.graphics.Color; import android.graphics.ColorFilter; -import android.graphics.ColorMatrixColorFilter; import android.graphics.Paint; import android.graphics.Path; import android.graphics.PixelFormat; @@ -96,7 +95,6 @@ public class GlifPatternDrawable extends Drawable { private int mColor; private Paint mTempPaint = new Paint(Paint.ANTI_ALIAS_FLAG); - private ColorFilter mColorFilter; public GlifPatternDrawable(int color) { setColor(color); @@ -140,17 +138,10 @@ public class GlifPatternDrawable extends Drawable { canvas.clipRect(bounds); scaleCanvasToBounds(canvas, bitmap, bounds); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB - && canvas.isHardwareAccelerated()) { - mTempPaint.setColorFilter(mColorFilter); - canvas.drawBitmap(bitmap, 0, 0, mTempPaint); - } else { - // Software renderer doesn't work properly with ColorMatrix filter on ALPHA_8 bitmaps. - canvas.drawColor(Color.BLACK); - mTempPaint.setColor(Color.WHITE); - canvas.drawBitmap(bitmap, 0, 0, mTempPaint); - canvas.drawColor(mColor); - } + canvas.drawColor(Color.BLACK); + mTempPaint.setColor(Color.WHITE); + canvas.drawBitmap(bitmap, 0, 0, mTempPaint); + canvas.drawColor(mColor); canvas.restore(); } @@ -299,12 +290,6 @@ public class GlifPatternDrawable extends Drawable { final int g = Color.green(color); final int b = Color.blue(color); mColor = Color.argb(COLOR_ALPHA_INT, r, g, b); - mColorFilter = new ColorMatrixColorFilter(new float[] { - 0, 0, 0, 1 - COLOR_ALPHA, r * COLOR_ALPHA, - 0, 0, 0, 1 - COLOR_ALPHA, g * COLOR_ALPHA, - 0, 0, 0, 1 - COLOR_ALPHA, b * COLOR_ALPHA, - 0, 0, 0, 0, 255 - }); invalidateSelf(); } |