diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2014-07-14 12:02:01 -0700 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2014-07-18 16:10:34 -0700 |
| commit | c5c60ad3592f53549c9ffaa58e9a87b0480080e8 (patch) | |
| tree | a4c01c55af65ca0262f9dfeade896fef263c7b0a /src/com/android/launcher3/FolderIcon.java | |
| parent | e8a30577f7451ed0f50ce7cd86e0d3f0c0e0d0bc (diff) | |
| download | android_packages_apps_Trebuchet-c5c60ad3592f53549c9ffaa58e9a87b0480080e8.tar.gz android_packages_apps_Trebuchet-c5c60ad3592f53549c9ffaa58e9a87b0480080e8.tar.bz2 android_packages_apps_Trebuchet-c5c60ad3592f53549c9ffaa58e9a87b0480080e8.zip | |
Merging Motorola's patch to disable apps when is safe mode.
issue: 16044192
Change-Id: I10069dcdf459ecc71361271e883eabb743d77822
Diffstat (limited to 'src/com/android/launcher3/FolderIcon.java')
| -rw-r--r-- | src/com/android/launcher3/FolderIcon.java | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/com/android/launcher3/FolderIcon.java b/src/com/android/launcher3/FolderIcon.java index 4f674f55a..4cf336f73 100644 --- a/src/com/android/launcher3/FolderIcon.java +++ b/src/com/android/launcher3/FolderIcon.java @@ -580,10 +580,17 @@ public class FolderIcon extends FrameLayout implements FolderListener { if (d != null) { mOldBounds.set(d.getBounds()); d.setBounds(0, 0, mIntrinsicIconSize, mIntrinsicIconSize); - d.setColorFilter(Color.argb(params.overlayAlpha, 255, 255, 255), - PorterDuff.Mode.SRC_ATOP); - d.draw(canvas); - d.clearColorFilter(); + if (d instanceof FastBitmapDrawable) { + FastBitmapDrawable fd = (FastBitmapDrawable) d; + fd.addBrightness(params.overlayAlpha); + d.draw(canvas); + fd.addBrightness(-params.overlayAlpha); + } else { + d.setColorFilter(Color.argb(params.overlayAlpha, 255, 255, 255), + PorterDuff.Mode.SRC_ATOP); + d.draw(canvas); + d.clearColorFilter(); + } d.setBounds(mOldBounds); } canvas.restore(); |