diff options
| author | Danesh M <daneshm90@gmail.com> | 2014-06-05 22:24:55 -0700 |
|---|---|---|
| committer | Danesh M <daneshm90@gmail.com> | 2014-06-05 23:03:33 -0700 |
| commit | f0e9642b93228fa6db8c499941a6fe948768ead8 (patch) | |
| tree | 354e65257057e778765df008626ca8b8e8154362 /src/com/android/launcher3/Utilities.java | |
| parent | d90bcfe751dc99b4712a883206bf2a164af8f6c4 (diff) | |
| download | android_packages_apps_Trebuchet-f0e9642b93228fa6db8c499941a6fe948768ead8.tar.gz android_packages_apps_Trebuchet-f0e9642b93228fa6db8c499941a6fe948768ead8.tar.bz2 android_packages_apps_Trebuchet-f0e9642b93228fa6db8c499941a6fe948768ead8.zip | |
Revert "Trebuchet : Decouple iconMask and iconBack dependency"
This reverts commit cb144c223edfa2a45fb0ae22791f198fd2018870.
Diffstat (limited to 'src/com/android/launcher3/Utilities.java')
| -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 282e47516..9b5cbe7eb 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(); - canvas.scale(scale, scale, width / 2, height/2); + if (iconMask != null && iconBack != null) { + canvas.scale(scale, scale, width / 2, height/2); + } icon.draw(canvas); canvas.restore(); - if (iconMask != null) { + if (iconBack != null && 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); |