diff options
3 files changed, 7 insertions, 9 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/onehanded/OneHandedAnimationController.java b/packages/SystemUI/src/com/android/systemui/onehanded/OneHandedAnimationController.java index 20ab114a97ec..1926c44abcba 100644 --- a/packages/SystemUI/src/com/android/systemui/onehanded/OneHandedAnimationController.java +++ b/packages/SystemUI/src/com/android/systemui/onehanded/OneHandedAnimationController.java @@ -19,11 +19,10 @@ package com.android.systemui.onehanded; import android.animation.Animator; import android.animation.ValueAnimator; import android.annotation.IntDef; -import android.content.Context; import android.graphics.Rect; import android.view.SurfaceControl; -import android.view.animation.AnimationUtils; import android.view.animation.Interpolator; +import android.view.animation.OvershootInterpolator; import androidx.annotation.VisibleForTesting; @@ -53,7 +52,7 @@ public class OneHandedAnimationController { public @interface TransitionDirection { } - private final Interpolator mFastOutSlowInInterpolator; + private final Interpolator mOvershootInterpolator; private final OneHandedSurfaceTransactionHelper mSurfaceTransactionHelper; private final HashMap<SurfaceControl, OneHandedTransitionAnimator> mAnimatorMap = new HashMap<>(); @@ -62,11 +61,10 @@ public class OneHandedAnimationController { * Constructor of OneHandedAnimationController */ @Inject - public OneHandedAnimationController(Context context, + public OneHandedAnimationController( OneHandedSurfaceTransactionHelper surfaceTransactionHelper) { mSurfaceTransactionHelper = surfaceTransactionHelper; - mFastOutSlowInInterpolator = AnimationUtils.loadInterpolator(context, - com.android.internal.R.interpolator.fast_out_slow_in); + mOvershootInterpolator = new OvershootInterpolator(); } @SuppressWarnings("unchecked") @@ -104,7 +102,7 @@ public class OneHandedAnimationController { OneHandedTransitionAnimator setupOneHandedTransitionAnimator( OneHandedTransitionAnimator animator) { animator.setSurfaceTransactionHelper(mSurfaceTransactionHelper); - animator.setInterpolator(mFastOutSlowInInterpolator); + animator.setInterpolator(mOvershootInterpolator); animator.setFloatValues(FRACTION_START, FRACTION_END); return animator; } diff --git a/packages/SystemUI/tests/src/com/android/systemui/onehanded/OneHandedAnimationControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/onehanded/OneHandedAnimationControllerTest.java index 86f4414009b6..583d0692565f 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/onehanded/OneHandedAnimationControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/onehanded/OneHandedAnimationControllerTest.java @@ -52,7 +52,7 @@ public class OneHandedAnimationControllerTest extends OneHandedTestCase { public void setUp() throws Exception { MockitoAnnotations.initMocks(this); - mOneHandedAnimationController = new OneHandedAnimationController(mContext, + mOneHandedAnimationController = new OneHandedAnimationController( new OneHandedSurfaceTransactionHelper(mContext)); } diff --git a/packages/SystemUI/tests/src/com/android/systemui/onehanded/OneHandedManagerImplTest.java b/packages/SystemUI/tests/src/com/android/systemui/onehanded/OneHandedManagerImplTest.java index 7d4700f5f38a..b6b2217837b2 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/onehanded/OneHandedManagerImplTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/onehanded/OneHandedManagerImplTest.java @@ -82,7 +82,7 @@ public class OneHandedManagerImplTest extends OneHandedTestCase { final OneHandedSurfaceTransactionHelper transactionHelper = new OneHandedSurfaceTransactionHelper(mContext); final OneHandedAnimationController animationController = new OneHandedAnimationController( - mContext, transactionHelper); + transactionHelper); OneHandedDisplayAreaOrganizer displayAreaOrganizer = new OneHandedDisplayAreaOrganizer( mContext, mMockDisplayController, animationController); |