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

Commit 31f6a00a authored by Jerry Chang's avatar Jerry Chang
Browse files

Apply overshoot interpolator to one-handed mode animation 

Fix: 155256402
Test: manul build and check one handed mode animation
Test: atest OneHandedAnimationControllerTest
Test: atest OneHandedManagerImplTest
Change-Id: Ic7f7a443ecd13824e551a1da9d099b6e07101180
parent 591928f2

packages/SystemUI/src/com/android/systemui/onehanded/OneHandedAnimationController.java

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

    }

packages/SystemUI/tests/src/com/android/systemui/onehanded/OneHandedAnimationControllerTest.java

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

    }

packages/SystemUI/tests/src/com/android/systemui/onehanded/OneHandedManagerImplTest.java

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