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

Commit d281cada authored by Jeff DeCew's avatar Jeff DeCew Committed by Android (Google) Code Review
Browse files

Merge changes from topic "wmshell-androidx-animation" into udc-qpr-dev 

* changes:
  Add androidx Animator isolation checks to SysuiTestCase
  ExpandHelper and ExpandHelperTest now use AndroidX / AnimatorTestRule
parents 66c1ccac a76f73d2

libs/WindowManager/Shell/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -151,6 +151,7 @@ android_library { 
    ],

    static_libs: [

        "androidx.appcompat_appcompat",

        "androidx.core_core-animation",

        "androidx.arch.core_core-runtime",

        "androidx-constraintlayout_constraintlayout",

        "androidx.dynamicanimation_dynamicanimation",

libs/WindowManager/Shell/src/com/android/wm/shell/animation/FlingAnimationUtils.java

+37 −0
Original line number Diff line number Diff line
@@ -108,6 +108,20 @@ public class FlingAnimationUtils { 
        apply(animator, currValue, endValue, velocity, Math.abs(endValue - currValue));

    }



    /**

     * Applies the interpolator and length to the animator, such that the fling animation is

     * consistent with the finger motion.

     *

     * @param animator  the animator to apply

     * @param currValue the current value

     * @param endValue  the end value of the animator

     * @param velocity  the current velocity of the motion

     */

    public void apply(androidx.core.animation.Animator animator,

            float currValue, float endValue, float velocity) {

        apply(animator, currValue, endValue, velocity, Math.abs(endValue - currValue));

    }



    /**

     * Applies the interpolator and length to the animator, such that the fling animation is

     * consistent with the finger motion.
@@ -141,6 +155,24 @@ public class FlingAnimationUtils { 
        animator.setInterpolator(properties.mInterpolator);

    }



    /**

     * Applies the interpolator and length to the animator, such that the fling animation is

     * consistent with the finger motion.

     *

     * @param animator    the animator to apply

     * @param currValue   the current value

     * @param endValue    the end value of the animator

     * @param velocity    the current velocity of the motion

     * @param maxDistance the maximum distance for this interaction; the maximum animation length

     *                    gets multiplied by the ratio between the actual distance and this value

     */

    public void apply(androidx.core.animation.Animator animator,

            float currValue, float endValue, float velocity, float maxDistance) {

        AnimatorProperties properties = getProperties(currValue, endValue, velocity, maxDistance);

        animator.setDuration(properties.mDuration);

        animator.setInterpolator(properties.getInterpolator());

    }



    /**

     * Applies the interpolator and length to the animator, such that the fling animation is

     * consistent with the finger motion.
@@ -367,6 +399,11 @@ public class FlingAnimationUtils { 
    private static class AnimatorProperties {

        Interpolator mInterpolator;

        long mDuration;



        /** Get an AndroidX interpolator wrapper of the current mInterpolator */

        public androidx.core.animation.Interpolator getInterpolator() {

            return mInterpolator::getInterpolation;

        }

    }



    /** Builder for {@link #FlingAnimationUtils}. */

packages/SystemUI/src/com/android/systemui/ExpandHelper.java

+7 −5
Original line number Diff line number Diff line
@@ -19,9 +19,6 @@ package com.android.systemui; 


import static com.android.internal.jank.InteractionJankMonitor.CUJ_NOTIFICATION_SHADE_ROW_EXPAND;



import android.animation.Animator;

import android.animation.AnimatorListenerAdapter;

import android.animation.ObjectAnimator;

import android.content.Context;

import android.util.FloatProperty;

import android.util.Log;
@@ -34,6 +31,11 @@ import android.view.VelocityTracker; 
import android.view.View;

import android.view.ViewConfiguration;



import androidx.annotation.NonNull;

import androidx.core.animation.Animator;

import androidx.core.animation.AnimatorListenerAdapter;

import androidx.core.animation.ObjectAnimator;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.jank.InteractionJankMonitor;

import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow;
@@ -616,7 +618,7 @@ public class ExpandHelper implements Gefingerpoken { 
                public boolean mCancelled;



                @Override

                public void onAnimationEnd(Animator animation) {

                public void onAnimationEnd(@NonNull Animator animation) {

                    if (!mCancelled) {

                        mCallback.setUserExpandedChild(scaledView, expand);

                        if (!mExpanding) {
@@ -633,7 +635,7 @@ public class ExpandHelper implements Gefingerpoken { 
                }



                @Override

                public void onAnimationCancel(Animator animation) {

                public void onAnimationCancel(@NonNull Animator animation) {

                    mCancelled = true;

                }

            });

packages/SystemUI/tests/src/com/android/systemui/ExpandHelperTest.java

+6 −1
Original line number Diff line number Diff line
@@ -20,12 +20,13 @@ import static org.mockito.ArgumentMatchers.any; 
import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.when;



import android.animation.ObjectAnimator;

import android.content.Context;

import android.testing.AndroidTestingRunner;

import android.testing.TestableLooper;

import android.testing.TestableLooper.RunWithLooper;



import androidx.core.animation.AnimatorTestRule;

import androidx.core.animation.ObjectAnimator;

import androidx.test.annotation.UiThreadTest;

import androidx.test.filters.SmallTest;
@@ -37,6 +38,7 @@ import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow 
import com.android.systemui.statusbar.notification.row.NotificationTestHelper;



import org.junit.Before;

import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;
@@ -45,6 +47,9 @@ import org.junit.runner.RunWith; 
@RunWithLooper

public class ExpandHelperTest extends SysuiTestCase {



    @Rule

    public final AnimatorTestRule mAnimatorTestRule = new AnimatorTestRule();



    private final FakeFeatureFlags mFeatureFlags = new FakeFeatureFlags();

    private ExpandableNotificationRow mRow;

    private ExpandHelper mExpandHelper;

packages/SystemUI/tests/src/com/android/systemui/statusbar/events/SystemEventChipAnimationControllerTest.kt

+3 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.util.Pair 
import android.view.Gravity

import android.view.View

import android.widget.FrameLayout

import androidx.core.animation.AnimatorTestRule

import androidx.test.filters.SmallTest

import com.android.systemui.SysuiTestCase

import com.android.systemui.flags.FakeFeatureFlags
@@ -38,6 +39,7 @@ import com.google.common.truth.Truth.assertThat 
import org.junit.Assert.assertFalse

import org.junit.Assert.assertTrue

import org.junit.Before

import org.junit.Rule

import org.junit.Test

import org.junit.runner.RunWith

import org.mockito.Mock
@@ -50,6 +52,7 @@ import org.mockito.MockitoAnnotations 
class SystemEventChipAnimationControllerTest : SysuiTestCase() {

    private lateinit var controller: SystemEventChipAnimationController



    @get:Rule val animatorTestRule = AnimatorTestRule()

    @Mock private lateinit var sbWindowController: StatusBarWindowController

    @Mock private lateinit var insetsProvider: StatusBarContentInsetsProvider