am ef8913c0: Merge "Remove dangerous and useless optimization Bug #5525888" into ics-mr1 (e118c1de) · Commits · e / os / android_frameworks_base

core/java/android/view/ViewGroup.java

+1 −7

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