diff options
| author | Chris Craik <ccraik@google.com> | 2015-03-10 22:02:23 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-10 22:02:24 +0000 |
| commit | 1d21dc22e2777b68d718f08e0e50767b1e205d67 (patch) | |
| tree | f3755e5b2d198b1ef9ed38543da6eac25dacac09 /core | |
| parent | 0b4db747d3524b3976a40bee22b92591f96abe5d (diff) | |
| parent | a57e9365cae98d7599fd5877dce15718349aa7a9 (diff) | |
| download | frameworks_base-1d21dc22e2777b68d718f08e0e50767b1e205d67.zip frameworks_base-1d21dc22e2777b68d718f08e0e50767b1e205d67.tar.gz frameworks_base-1d21dc22e2777b68d718f08e0e50767b1e205d67.tar.bz2 | |
Merge "Add several CallSupers to View"
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/view/View.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 7d49969..085a3f2 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -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; } |