diff options
| author | Danesh Mondegarian <daneshm90@gmail.com> | 2014-02-28 22:31:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2014-02-28 22:31:05 +0000 |
| commit | 23a4e730a5f73164591d9aace93e5f9f45345b8c (patch) | |
| tree | bdfe78823b410c0e82d89789f31c13447477ec97 | |
| parent | 12f574986e5fabb95ee7031b46b5d4380a108769 (diff) | |
| parent | cb144c223edfa2a45fb0ae22791f198fd2018870 (diff) | |
| download | android_packages_apps_Trebuchet-23a4e730a5f73164591d9aace93e5f9f45345b8c.tar.gz android_packages_apps_Trebuchet-23a4e730a5f73164591d9aace93e5f9f45345b8c.tar.bz2 android_packages_apps_Trebuchet-23a4e730a5f73164591d9aace93e5f9f45345b8c.zip | |
Merge "Trebuchet : Decouple iconMask and iconBack dependency" into cm-11.0
| -rw-r--r-- | src/com/android/launcher3/Utilities.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java index 9b5cbe7eb..282e47516 100644 --- a/src/com/android/launcher3/Utilities.java +++ b/src/com/android/launcher3/Utilities.java @@ -170,16 +170,16 @@ final class Utilities { sOldBounds.set(icon.getBounds()); icon.setBounds(left, top, left+width, top+height); canvas.save(); - if (iconMask != null && iconBack != null) { - canvas.scale(scale, scale, width / 2, height/2); - } + canvas.scale(scale, scale, width / 2, height/2); icon.draw(canvas); canvas.restore(); - if (iconBack != null && iconMask != null) { + if (iconMask != null) { iconMask.setBounds(icon.getBounds()); ((BitmapDrawable) iconMask).getPaint().setXfermode( new PorterDuffXfermode(PorterDuff.Mode.DST_OUT)); iconMask.draw(canvas); + } + if (iconBack != null) { canvas.setBitmap(null); Bitmap finalBitmap = Bitmap.createBitmap(textureWidth, textureHeight, Bitmap.Config.ARGB_8888); |