Merge "Remove unnecessary shadow damage calc in invalidate" (d047116f) · Commits · e / os / android_frameworks_base

core/java/android/view/View.java

+0 −25

Original line number	Diff line number	Diff line
		@@ -14041,11 +14041,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		receiver.damageInParent();
		}
		}

		// Damage the entire IsolatedZVolume receiving this view's shadow.
		if (isHardwareAccelerated() && getZ() != 0) {
		damageShadowReceiver();
		}
		}
		}

		@@ -14072,23 +14067,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		return mBackground != null;
		}

		/**
		* Damage area of the screen that can be covered by this View's shadow.
		*
		* This method will guarantee that any changes to shadows cast by a View
		* are damaged on the screen for future redraw.
		*/
		private void damageShadowReceiver() {
		final AttachInfo ai = mAttachInfo;
		if (ai != null) {
		ViewParent p = getParent();
		if (p != null && p instanceof ViewGroup) {
		final ViewGroup vg = (ViewGroup) p;
		vg.damageInParent();
		}
		}
		}

		/**
		* Quick invalidation for View property changes (alpha, translationXY, etc.). We don't want to
		* set any flags or handle all of the cases handled by the default invalidation methods.
		@@ -14119,9 +14097,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		} else {
		damageInParent();
		}
		if (isHardwareAccelerated() && invalidateParent && getZ() != 0) {
		damageShadowReceiver();
		}
		}

		/**