commit affd7b4d23cecb4ed74133dd8bd9a5ede099c562
author Winson Chung <winsonc@google.com> Fri Aug 20 15:11:56 2010 -0700
committer Winson Chung <winsonc@google.com> Fri Aug 20 15:17:26 2010 -0700
tree cb3b3c60679c91a5f301d07762c41d0c195233fb
parent 03c568e608573d5199c03936ed3ad9937cb96732

Fixing alpha issue on AllApps.

Change-Id: Ifbd81b3e8009cff963bb03bd953e498f8677cc38

src/com/android/launcher2/PagedViewIcon.java

diff --git a/src/com/android/launcher2/PagedViewIcon.java b/src/com/android/launcher2/PagedViewIcon.java
index ea5e6d7..01f36dc 100644
--- a/src/com/android/launcher2/PagedViewIcon.java
+++ b/src/com/android/launcher2/PagedViewIcon.java
@@ -170,17 +170,9 @@
     @Override
     public void setAlpha(float alpha) {
         final float viewAlpha = sHolographicOutlineHelper.viewAlphaInterpolator(alpha);
-        mAlpha = (int) (viewAlpha * 255);
         final float holographicAlpha = sHolographicOutlineHelper.highlightAlphaInterpolator(alpha);
+        mAlpha = (int) (viewAlpha * 255);
         mHolographicAlpha = (int) (holographicAlpha * 255);
-
-        // WORKAROUND: until TextView handles canvas shadow layer alpha itself
-        int sRed = Color.red(mShadowColor);
-        int sGreen = Color.green(mShadowColor);
-        int sBlue = Color.blue(mShadowColor);
-        super.setShadowLayer(mShadowRadius, mShadowDx, mShadowDy, Color.argb(mAlpha, sRed, sGreen,
-                sBlue));
-
         super.setAlpha(viewAlpha);
     }
 
@@ -227,27 +219,17 @@
         }
     }
 
-    // WORKAROUND: until TextView handles canvas shadow layer alpha itself
-    float mShadowRadius, mShadowDx, mShadowDy;
-    int mShadowColor;
-    @Override
-    public void setShadowLayer(float radius, float dx, float dy, int color) {
-        mShadowRadius = radius;
-        mShadowDx = dx;
-        mShadowDy = dy;
-        mShadowColor = color;
-        super.setShadowLayer(radius, dx, dy, color);
-    }
-
     @Override
     protected void onDraw(Canvas canvas) {
+        // draw the view itself
         if (mIsHolographicUpdatePass) {
             // only clip to the text view (restore its alpha so that we get a proper outline)
             canvas.save();
             canvas.clipRect(mDrawableClipRect, Op.REPLACE);
-            super.onSetAlpha(255);
+            final float alpha = getAlpha();
+            super.setAlpha(1.0f);
             super.onDraw(canvas);
-            super.onSetAlpha(mAlpha);
+            super.setAlpha(alpha);
             canvas.restore();
         } else {
             if (mAlpha > 0) {