diff options
author | Winson Chung <winsonc@google.com> | 2010-12-13 12:11:33 -0800 |
---|---|---|
committer | Winson Chung <winsonc@google.com> | 2010-12-14 15:32:02 -0800 |
commit | 88127038178b3bbf0eb91103a31e682cc0615074 (patch) | |
tree | b380b586ed42782e8d9f34866dc083dec435e90b /src/com/android/launcher2/PagedViewIcon.java | |
parent | 09a19c4cfc91795a11ae0b4e75b6fc6588cffee9 (diff) | |
download | android_packages_apps_Trebuchet-88127038178b3bbf0eb91103a31e682cc0615074.tar.gz android_packages_apps_Trebuchet-88127038178b3bbf0eb91103a31e682cc0615074.tar.bz2 android_packages_apps_Trebuchet-88127038178b3bbf0eb91103a31e682cc0615074.zip |
Various tweaks to launcher
- Removing hotdog for shadow bg protection
- Adding bg protection for customization tray
- Restoring holographic outlines for all apps
- Small bug fixes
Change-Id: I58d81bb490f78c76fcaf46122febc3c1aace854e
Diffstat (limited to 'src/com/android/launcher2/PagedViewIcon.java')
-rw-r--r-- | src/com/android/launcher2/PagedViewIcon.java | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/com/android/launcher2/PagedViewIcon.java b/src/com/android/launcher2/PagedViewIcon.java index 884884e31..d91daf918 100644 --- a/src/com/android/launcher2/PagedViewIcon.java +++ b/src/com/android/launcher2/PagedViewIcon.java @@ -52,7 +52,7 @@ public class PagedViewIcon extends CacheableTextView implements Checkable { private Object mIconCacheKey; private PagedViewIconCache mIconCache; - private int mAlpha; + private int mAlpha = 255; private int mHolographicAlpha; private boolean mIsChecked; @@ -64,8 +64,6 @@ public class PagedViewIcon extends CacheableTextView implements Checkable { // Highlight colors private int mHoloBlurColor; private int mHoloOutlineColor; - private int mCheckedBlurColor; - private int mCheckedOutlineColor; private static final HandlerThread sWorkerThread = new HandlerThread("pagedviewicon-helper"); static { @@ -110,11 +108,8 @@ public class PagedViewIcon extends CacheableTextView implements Checkable { super(context, attrs, defStyle); TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.PagedViewIcon, defStyle, 0); - mAlpha = 255; mHoloBlurColor = a.getColor(R.styleable.PagedViewIcon_blurColor, 0); mHoloOutlineColor = a.getColor(R.styleable.PagedViewIcon_outlineColor, 0); - mCheckedBlurColor = a.getColor(R.styleable.PagedViewIcon_checkedBlurColor, 0); - mCheckedOutlineColor = a.getColor(R.styleable.PagedViewIcon_checkedOutlineColor, 0); a.recycle(); if (sHolographicOutlineHelper == null) { @@ -126,14 +121,12 @@ public class PagedViewIcon extends CacheableTextView implements Checkable { } private void queueHolographicOutlineCreation() { - /* Temporarily disabling holographic outline creation. // Generate the outline in the background if (mHolographicOutline == null) { Message m = sWorker.obtainMessage(MESSAGE_CREATE_HOLOGRAPHIC_OUTLINE); m.obj = this; sWorker.sendMessage(m); } - */ } public void applyFromApplicationInfo(ApplicationInfo info, PagedViewIconCache cache, @@ -248,7 +241,7 @@ public class PagedViewIcon extends CacheableTextView implements Checkable { if (mCheckedAlphaAnimator != null) { mCheckedAlphaAnimator.cancel(); } - mCheckedAlphaAnimator = ObjectAnimator.ofFloat(this, "alpha", alpha); + mCheckedAlphaAnimator = ObjectAnimator.ofFloat(this, "alpha", getAlpha(), alpha); mCheckedAlphaAnimator.setDuration(duration); mCheckedAlphaAnimator.start(); |