Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'ef8913c035e679ea8b8891e26db1fa571e9b9d54':
  Remove dangerous and useless optimization Bug #5525888
This commit is contained in:
Dave Burke
2011-12-07 20:41:27 -08:00
committed by Android Git Automerger
parent ea75b82221 ef8913c035
commit e118c1de00
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/view/ViewGroup.java
View File

@@ -2719,13 +2719,6 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
return more; 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) { if (hardwareAccelerated) {
// Clear INVALIDATED flag to allow invalidation to occur during rendering, but // Clear INVALIDATED flag to allow invalidation to occur during rendering, but
// retain the flag's value temporarily in the mRecreateDisplayList flag // 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 || alpha < 1.0f || !child.hasIdentityMatrix()) {
if (transformToApply != null || !childHasIdentityMatrix) { if (transformToApply != null || !childHasIdentityMatrix) {
int transX = 0; int transX = 0;