summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeon Scroggins III <scroggo@google.com>2014-07-09 14:57:51 -0400
committerLeon Scroggins III <scroggo@google.com>2014-07-09 14:57:51 -0400
commit5c102db5a1a16a2adcc7728693a6e65a981f91ae (patch)
treed6697b3ad52b623cf47828bbbd926ce709bb942a
parentdf01966f999ddcc69b3e479c9efbd733ad86bc84 (diff)
downloadbitmap-master-soong.tar.gz
Call setLocalMatrix before setShader.android-wear-5.1.1_r1android-wear-5.1.0_r1android-wear-5.0.0_r1android-m-preview-2android-m-preview-1android-m-previewandroid-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-cts-5.0_r9android-cts-5.0_r8android-cts-5.0_r7android-cts-5.0_r6android-cts-5.0_r5android-cts-5.0_r4android-cts-5.0_r3android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r5android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r28android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r22android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r17android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r12android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1android-5.0.2_r3android-5.0.2_r1android-5.0.1_r1android-5.0.0_r7android-5.0.0_r6android-5.0.0_r5.1android-5.0.0_r5android-5.0.0_r4android-5.0.0_r3android-5.0.0_r2android-5.0.0_r1master-soonglollipop-wear-releaselollipop-releaselollipop-mr1-wfc-releaselollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-releaselollipop-devlollipop-cts-release
This is now required in order to affect the Paint. BUG:14315916 Change-Id: I7afa525d4a1d0e71d0ca5c79780c7d8b9100a959
-rw-r--r--src/com/android/bitmap/drawable/CircularBitmapDrawable.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/bitmap/drawable/CircularBitmapDrawable.java b/src/com/android/bitmap/drawable/CircularBitmapDrawable.java
index a4af368..942cbfb 100644
--- a/src/com/android/bitmap/drawable/CircularBitmapDrawable.java
+++ b/src/com/android/bitmap/drawable/CircularBitmapDrawable.java
@@ -125,7 +125,6 @@ public class CircularBitmapDrawable extends ExtendedBitmapDrawable {
if (shader == null || mShaderBitmap != bitmap) {
shader = new BitmapShader(bitmap, TileMode.CLAMP, TileMode.CLAMP);
mShaderBitmap = bitmap;
- mBitmapPaint.setShader(shader);
}
sMatrix.reset();
@@ -136,6 +135,7 @@ public class CircularBitmapDrawable extends ExtendedBitmapDrawable {
// Translate bitmap to dst bounds.
sMatrix.postTranslate(dst.left, dst.top);
shader.setLocalMatrix(sMatrix);
+ mBitmapPaint.setShader(shader);
int oldAlpha = mBitmapPaint.getAlpha();
mBitmapPaint.setAlpha((int) (oldAlpha * alpha));