Merge "Javadocs fixes for deprecated methods on OverScroller"

4 files changed, 10 insertions, 8 deletions

diff --git a/api/current.txt b/api/current.txt
index fc3c74730952..4aba4e9499f3 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -47307,8 +47307,8 @@ package android.widget {
   public class OverScroller {
     ctor public OverScroller(android.content.Context);
     ctor public OverScroller(android.content.Context, android.view.animation.Interpolator);
-    ctor public OverScroller(android.content.Context, android.view.animation.Interpolator, float, float);
-    ctor public OverScroller(android.content.Context, android.view.animation.Interpolator, float, float, boolean);
+    ctor public deprecated OverScroller(android.content.Context, android.view.animation.Interpolator, float, float);
+    ctor public deprecated OverScroller(android.content.Context, android.view.animation.Interpolator, float, float, boolean);
     method public void abortAnimation();
     method public boolean computeScrollOffset();
     method public void fling(int, int, int, int, int, int, int, int);
diff --git a/api/system-current.txt b/api/system-current.txt
index 8565e64a7576..f213e2639ebe 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -50835,8 +50835,8 @@ package android.widget {
   public class OverScroller {
     ctor public OverScroller(android.content.Context);
     ctor public OverScroller(android.content.Context, android.view.animation.Interpolator);
-    ctor public OverScroller(android.content.Context, android.view.animation.Interpolator, float, float);
-    ctor public OverScroller(android.content.Context, android.view.animation.Interpolator, float, float, boolean);
+    ctor public deprecated OverScroller(android.content.Context, android.view.animation.Interpolator, float, float);
+    ctor public deprecated OverScroller(android.content.Context, android.view.animation.Interpolator, float, float, boolean);
     method public void abortAnimation();
     method public boolean computeScrollOffset();
     method public void fling(int, int, int, int, int, int, int, int);
diff --git a/api/test-current.txt b/api/test-current.txt
index 3fb0c69d7612..d4a80184badd 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -47392,8 +47392,8 @@ package android.widget {
   public class OverScroller {
     ctor public OverScroller(android.content.Context);
     ctor public OverScroller(android.content.Context, android.view.animation.Interpolator);
-    ctor public OverScroller(android.content.Context, android.view.animation.Interpolator, float, float);
-    ctor public OverScroller(android.content.Context, android.view.animation.Interpolator, float, float, boolean);
+    ctor public deprecated OverScroller(android.content.Context, android.view.animation.Interpolator, float, float);
+    ctor public deprecated OverScroller(android.content.Context, android.view.animation.Interpolator, float, float, boolean);
     method public void abortAnimation();
     method public boolean computeScrollOffset();
     method public void fling(int, int, int, int, int, int, int, int);
diff --git a/core/java/android/widget/OverScroller.java b/core/java/android/widget/OverScroller.java
index 50569d7e8f72..99387896913a 100644
--- a/core/java/android/widget/OverScroller.java
+++ b/core/java/android/widget/OverScroller.java
@@ -89,8 +89,9 @@ public class OverScroller {
      * means no bounce. This behavior is no longer supported and this coefficient has no effect.
      * @param bounceCoefficientY Same as bounceCoefficientX but for the vertical direction. This
      * behavior is no longer supported and this coefficient has no effect.
-     * !deprecated Use {!link #OverScroller(Context, Interpolator, boolean)} instead.
+     * @deprecated Use {@link #OverScroller(Context, Interpolator)} instead.
      */
+    @Deprecated
     public OverScroller(Context context, Interpolator interpolator,
             float bounceCoefficientX, float bounceCoefficientY) {
         this(context, interpolator, true);
@@ -107,8 +108,9 @@ public class OverScroller {
      * @param bounceCoefficientY Same as bounceCoefficientX but for the vertical direction. This
      * behavior is no longer supported and this coefficient has no effect.
      * @param flywheel If true, successive fling motions will keep on increasing scroll speed.
-     * !deprecated Use {!link OverScroller(Context, Interpolator, boolean)} instead.
+     * @deprecated Use {@link #OverScroller(Context, Interpolator)} instead.
      */
+    @Deprecated
     public OverScroller(Context context, Interpolator interpolator,
             float bounceCoefficientX, float bounceCoefficientY, boolean flywheel) {
         this(context, interpolator, flywheel);