summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2013-10-02 06:58:17 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-02 06:58:17 -0700
commit3c326cf80050f38c651b4d744928cbefa5cf79dc (patch)
tree6830153c1a327ee64e4182a84ee3a3dfda286ce9
parent240946d7c8f10d27e5ffc3bafbd88d3babb1ff84 (diff)
parent156fbff4a2afaddf078282d23b53375f2caad3df (diff)
downloadandroid_packages_apps_Trebuchet-3c326cf80050f38c651b4d744928cbefa5cf79dc.tar.gz
android_packages_apps_Trebuchet-3c326cf80050f38c651b4d744928cbefa5cf79dc.tar.bz2
android_packages_apps_Trebuchet-3c326cf80050f38c651b4d744928cbefa5cf79dc.zip
am 156fbff4: am 7f331b6b: Merge "Change folder icon item overlay to white (issue 11030725)" into jb-ub-now-indigo-rose
* commit '156fbff4a2afaddf078282d23b53375f2caad3df': Change folder icon item overlay to white (issue 11030725)
-rw-r--r--src/com/android/launcher3/FolderIcon.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/launcher3/FolderIcon.java b/src/com/android/launcher3/FolderIcon.java
index 7c791b99f..7e1e350a4 100644
--- a/src/com/android/launcher3/FolderIcon.java
+++ b/src/com/android/launcher3/FolderIcon.java
@@ -536,7 +536,8 @@ public class FolderIcon extends LinearLayout implements FolderListener {
if (d != null) {
d.setBounds(0, 0, mIntrinsicIconSize, mIntrinsicIconSize);
d.setFilterBitmap(true);
- d.setColorFilter(Color.argb(params.overlayAlpha, 0, 0, 0), PorterDuff.Mode.SRC_ATOP);
+ d.setColorFilter(Color.argb(params.overlayAlpha, 255, 255, 255),
+ PorterDuff.Mode.SRC_ATOP);
d.draw(canvas);
d.clearColorFilter();
d.setFilterBitmap(false);