Merge "Add several CallSupers to View" (1d21dc22) · Commits · e / os / android_frameworks_base

core/java/android/view/View.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -13089,6 +13089,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		*
		* @see #onDetachedFromWindow()
		*/
		@CallSuper
		protected void onAttachedToWindow() {
		if ((mPrivateFlags & PFLAG_REQUEST_TRANSPARENT_REGIONS) != 0) {
		mParent.requestTransparentRegion(this);
		@@ -13421,6 +13422,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		*
		* @see #onAttachedToWindow()
		*/
		@CallSuper
		protected void onDetachedFromWindow() {
		}

		@@ -13741,6 +13743,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		* @see #dispatchSaveInstanceState(android.util.SparseArray)
		* @see #setSaveEnabled(boolean)
		*/
		@CallSuper
		protected Parcelable onSaveInstanceState() {
		mPrivateFlags \|= PFLAG_SAVE_STATE_CALLED;
		return BaseSavedState.EMPTY_STATE;
		@@ -13799,6 +13802,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		* @see #restoreHierarchyState(android.util.SparseArray)
		* @see #dispatchRestoreInstanceState(android.util.SparseArray)
		*/
		@CallSuper
		protected void onRestoreInstanceState(Parcelable state) {
		mPrivateFlags \|= PFLAG_SAVE_STATE_CALLED;
		if (state != BaseSavedState.EMPTY_STATE && state != null) {
		@@ -17987,6 +17991,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		* @see #setAnimation(android.view.animation.Animation)
		* @see #getAnimation()
		*/
		@CallSuper
		protected void onAnimationStart() {
		mPrivateFlags \|= PFLAG_ANIMATION_STARTED;
		}
		@@ -17999,6 +18004,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		* @see #setAnimation(android.view.animation.Animation)
		* @see #getAnimation()
		*/
		@CallSuper
		protected void onAnimationEnd() {
		mPrivateFlags &= ~PFLAG_ANIMATION_STARTED;
		}