Add a compile time condition to remove unnecessary code (fe455af2) · Commits · e / os / android_frameworks_base

core/java/android/view/View.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -6818,8 +6818,8 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal

		if ((changed & VISIBILITY_MASK) != 0) {
		if (mParent instanceof ViewGroup) {
		((ViewGroup) mParent).onChildVisibilityChanged(this, (changed & VISIBILITY_MASK),
		(flags & VISIBILITY_MASK));
		((ViewGroup) mParent).onChildVisibilityChanged(this,
		(changed & VISIBILITY_MASK), (flags & VISIBILITY_MASK));
		((View) mParent).invalidate(true);
		} else if (mParent != null) {
		mParent.invalidateChild(this, null);

+114 −109

Original line number	Diff line number	Diff line
		@@ -3601,6 +3601,8 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
		// through
		final boolean drawAnimation = (child.mPrivateFlags & DRAW_ANIMATION) == DRAW_ANIMATION;

		//noinspection PointlessBooleanExpression
		if (!HardwareRenderer.RENDER_DIRTY_REGIONS) {
		if (dirty == null) {
		if (child.mLayerType != LAYER_TYPE_NONE) {
		mPrivateFlags \|= INVALIDATED;
		@@ -3647,7 +3649,11 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
		}
		}
		} while (parent != null);
		} else {
		}

		return;
		}

		// Check whether the child that requests the invalidate is fully opaque
		// Views being animated or transformed are not considered opaque because we may
		// be invalidating their old position and need the parent to paint behind them.
		@@ -3726,7 +3732,6 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
		} while (parent != null);
		}
		}
		}

		/**
		* Don't call or override this method. It is used for the implementation of