From c7ee3cab56b8cc90c4f6659a262a1cba5c71e92a Mon Sep 17 00:00:00 2001 From: Romain Guy Date: Wed, 7 Dec 2011 19:06:28 -0800 Subject: Remove dangerous and useless optimization Bug #5525888 Change-Id: I553828c0da09b15d0dce3727e4c26a9d0bcf72ea --- core/java/android/view/ViewGroup.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java index 63d7e29a69bc..600bfe6c7e3a 100644 --- a/core/java/android/view/ViewGroup.java +++ b/core/java/android/view/ViewGroup.java @@ -2719,13 +2719,6 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager 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 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager } } + float alpha = child.getAlpha(); if (transformToApply != null || alpha < 1.0f || !child.hasIdentityMatrix()) { if (transformToApply != null || !childHasIdentityMatrix) { int transX = 0; -- cgit v1.2.3-59-g8ed1b