Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29840f30 authored by Kirill Grouchnikov's avatar Kirill Grouchnikov Committed by Android (Google) Code Review
Browse files

Merge "Javadocs fixes for deprecated methods on OverScroller"

parents 1fd68ad9 cdac5153

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -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);

api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -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);

api/test-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -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);

core/java/android/widget/OverScroller.java

+4 −2
Original line number Diff line number Diff line
@@ -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);