diff options
| author | Dave Burke <daveburke@google.com> | 2011-12-07 20:41:27 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-07 20:41:27 -0800 |
| commit | e118c1de0037e6732b66b9f52903567caa961c31 (patch) | |
| tree | cf836f9a509b59a2052786edb3fb2595f532429f /core/java | |
| parent | ea75b82221dc9086cf97a791aed3b79ff3731bba (diff) | |
| parent | ef8913c035e679ea8b8891e26db1fa571e9b9d54 (diff) | |
| download | frameworks_base-e118c1de0037e6732b66b9f52903567caa961c31.zip frameworks_base-e118c1de0037e6732b66b9f52903567caa961c31.tar.gz frameworks_base-e118c1de0037e6732b66b9f52903567caa961c31.tar.bz2 | |
am ef8913c0: Merge "Remove dangerous and useless optimization Bug #5525888" into ics-mr1
* commit 'ef8913c035e679ea8b8891e26db1fa571e9b9d54':
Remove dangerous and useless optimization Bug #5525888
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/view/ViewGroup.java | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java index 63d7e29..600bfe6 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; |