commit ef8913c035e679ea8b8891e26db1fa571e9b9d54
author Dave Burke <daveburke@google.com> Wed Dec 07 20:40:10 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Dec 07 20:40:10 2011 -0800
tree cf836f9a509b59a2052786edb3fb2595f532429f
parent 234a5ef66275087aff9cfb94adc7608e9f358f11
parent c7ee3cab56b8cc90c4f6659a262a1cba5c71e92a

Merge "Remove dangerous and useless optimization Bug #5525888" into ics-mr1

core/java/android/view/ViewGroup.java

diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java
index 63d7e29a..600bfe6 100644
--- a/core/java/android/view/ViewGroup.java
+++ b/core/java/android/view/ViewGroup.java
@@ -2719,13 +2719,6 @@
             return more;
         }
 
-        float alpha = child.getAlpha();
-        // Bail out early if the view does not need to be drawn
-        if (alpha <= ViewConfiguration.ALPHA_THRESHOLD && (child.mPrivateFlags & ALPHA_SET) == 0 &&
-                !(child instanceof SurfaceView)) {
-            return more;
-        }
-
         if (hardwareAccelerated) {
             // Clear INVALIDATED flag to allow invalidation to occur during rendering, but
             // retain the flag's value temporarily in the mRecreateDisplayList flag
@@ -2779,6 +2772,7 @@
             }
         }
 
+        float alpha = child.getAlpha();
         if (transformToApply != null || alpha < 1.0f || !child.hasIdentityMatrix()) {
             if (transformToApply != null || !childHasIdentityMatrix) {
                 int transX = 0;