Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixing Spline parameters when changing duration/position of Overscroller" into sc-dev

Browse Source
This commit is contained in:
Sunny Goyal
2021-03-30 20:14:56 +00:00
committed by Android (Google) Code Review
parent be1d260309 98d4e403cd
commit b94b6a18a3
1 changed files with 6 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
core/java/android/widget/OverScroller.java
View File

@@ -232,11 +232,8 @@ public class OverScroller {
*
* @return The duration of the scroll in milliseconds.
*
* @hide Pending removal once nothing depends on it
* @deprecated OverScrollers don't necessarily have a fixed duration.
* This function will lie to the best of its ability.
* @hide
*/
@Deprecated
public final int getDuration() {
return Math.max(mScrollerX.mDuration, mScrollerY.mDuration);
}
@@ -249,13 +246,8 @@ public class OverScroller {
* @see #setFinalX(int)
* @see #setFinalY(int)
*
* @hide Pending removal once nothing depends on it
* @deprecated OverScrollers don't necessarily have a fixed duration.
* Instead of setting a new final position and extending
* the duration of an existing scroll, use startScroll
* to begin a new animation.
* @hide
*/
@Deprecated
@UnsupportedAppUsage
public void extendDuration(int extend) {
mScrollerX.extendDuration(extend);
@@ -269,13 +261,8 @@ public class OverScroller {
* @see #extendDuration(int)
* @see #setFinalY(int)
*
* @hide Pending removal once nothing depends on it
* @deprecated OverScroller's final position may change during an animation.
* Instead of setting a new final position and extending
* the duration of an existing scroll, use startScroll
* to begin a new animation.
* @hide
*/
@Deprecated
public void setFinalX(int newX) {
mScrollerX.setFinalPosition(newX);
}
@@ -287,13 +274,8 @@ public class OverScroller {
* @see #extendDuration(int)
* @see #setFinalX(int)
*
* @hide Pending removal once nothing depends on it
* @deprecated OverScroller's final position may change during an animation.
* Instead of setting a new final position and extending
* the duration of an existing scroll, use startScroll
* to begin a new animation.
* @hide
*/
@Deprecated
public void setFinalY(int newY) {
mScrollerY.setFinalPosition(newY);
}
@@ -710,13 +692,14 @@ public class OverScroller {
void setFinalPosition(int position) {
mFinal = position;
mSplineDistance = mFinal - mStart;
mFinished = false;
}
void extendDuration(int extend) {
final long time = AnimationUtils.currentAnimationTimeMillis();
final int elapsedTime = (int) (time - mStartTime);
mDuration = elapsedTime + extend;
mDuration = mSplineDuration = elapsedTime + extend;
mFinished = false;
}