diff options
| author | Tor Norbye <tnorbye@google.com> | 2015-03-02 10:11:44 -0800 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2015-03-07 20:49:18 -0800 |
| commit | c615c6fc9caca76cd96998f86e1f1e6393aeadbb (patch) | |
| tree | 4b481c34d57468eb166860d4827aebe11ed6bd94 /core/java/android/animation | |
| parent | 3aa2d01752ffecb4a9847249eefd7fa3cffeb309 (diff) | |
| download | frameworks_base-c615c6fc9caca76cd96998f86e1f1e6393aeadbb.zip frameworks_base-c615c6fc9caca76cd96998f86e1f1e6393aeadbb.tar.gz frameworks_base-c615c6fc9caca76cd96998f86e1f1e6393aeadbb.tar.bz2 | |
Annotate methods to be called from overrides with @CallSuper
Change-Id: Ibc587c2aaee9f3e7f448079f72a75459fe4e15e7
Diffstat (limited to 'core/java/android/animation')
| -rw-r--r-- | core/java/android/animation/ObjectAnimator.java | 3 | ||||
| -rw-r--r-- | core/java/android/animation/ValueAnimator.java | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/core/java/android/animation/ObjectAnimator.java b/core/java/android/animation/ObjectAnimator.java index 87ad49b..3f71d51 100644 --- a/core/java/android/animation/ObjectAnimator.java +++ b/core/java/android/animation/ObjectAnimator.java @@ -16,6 +16,7 @@ package android.animation; +import android.annotation.CallSuper; import android.annotation.NonNull; import android.annotation.Nullable; import android.graphics.Path; @@ -861,6 +862,7 @@ public final class ObjectAnimator extends ValueAnimator { * <p>Overriders of this method should call the superclass method to cause * internal mechanisms to be set up correctly.</p> */ + @CallSuper @Override void initAnimation() { if (!mInitialized) { @@ -961,6 +963,7 @@ public final class ObjectAnimator extends ValueAnimator { * * @param fraction The elapsed fraction of the animation. */ + @CallSuper @Override void animateValue(float fraction) { final Object target = getTarget(); diff --git a/core/java/android/animation/ValueAnimator.java b/core/java/android/animation/ValueAnimator.java index 118af64..85dc832 100644 --- a/core/java/android/animation/ValueAnimator.java +++ b/core/java/android/animation/ValueAnimator.java @@ -16,6 +16,7 @@ package android.animation; +import android.annotation.CallSuper; import android.os.Looper; import android.os.Trace; import android.util.AndroidRuntimeException; @@ -506,6 +507,7 @@ public class ValueAnimator extends Animator { * <p>Overrides of this method should call the superclass method to ensure * that internal mechanisms for the animation are set up correctly.</p> */ + @CallSuper void initAnimation() { if (!mInitialized) { int numValues = mValues.length; @@ -1375,6 +1377,7 @@ public class ValueAnimator extends Animator { * * @param fraction The elapsed fraction of the animation. */ + @CallSuper void animateValue(float fraction) { fraction = mInterpolator.getInterpolation(fraction); mCurrentFraction = fraction; |