Merge "Fix invisible views issue in Launcher."

2 files changed, 5 insertions, 1 deletions

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 472f7b4..7ee360d 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -5468,9 +5468,11 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility
     public void setAlpha(float alpha) {
         mAlpha = alpha;
         if (onSetAlpha((int) (alpha * 255))) {
+            mPrivateFlags |= ALPHA_SET;
             // subclass is handling alpha - don't optimize rendering cache invalidation
             invalidate();
         } else {
+            mPrivateFlags &= ~ALPHA_SET;
             invalidate(false);
         }
     }
diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java
index be6aa43..b1db5ca 100644
--- a/core/java/android/view/ViewGroup.java
+++ b/core/java/android/view/ViewGroup.java
@@ -2188,7 +2188,9 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
         
         float alpha = child.getAlpha();
         // Bail out early if the view does not need to be drawn
-        if (alpha <= ViewConfiguration.ALPHA_THRESHOLD) return more;
+        if (alpha <= ViewConfiguration.ALPHA_THRESHOLD && (child.mPrivateFlags & ALPHA_SET) == 0) {
+            return more;
+        }
 
         child.computeScroll();