Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9650b018 authored by Dave Burke's avatar Dave Burke Committed by Android Git Automerger
Browse files

am e118c1de: am ef8913c0: Merge "Remove dangerous and useless optimization Bug... 

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

* commit 'e118c1de':
  Remove dangerous and useless optimization Bug #5525888
parents a78a08b1 e118c1de

core/java/android/view/ViewGroup.java

+1 −7
Original line number Diff line number Diff line
@@ -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;