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

Commit 40697be0 authored by Behnam Heydarshahi's avatar Behnam Heydarshahi Committed by Automerger Merge Worker
Browse files

Process lingering animators after volume tests am: 8c2ced25 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24296593



Change-Id: Ie62ebbc2fadf4644e4df110aeb14a26016eb1a84
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 86d745ad 8c2ced25

packages/SystemUI/tests/src/com/android/systemui/volume/VolumeDialogImplTest.java

+12 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import static org.mockito.Mockito.times; 
import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import android.animation.AnimatorTestRule;

import android.app.KeyguardManager;

import android.content.res.Configuration;

import android.media.AudioManager;
@@ -84,6 +85,7 @@ import java.util.function.Predicate; 
@RunWith(AndroidTestingRunner.class)

@TestableLooper.RunWithLooper

public class VolumeDialogImplTest extends SysuiTestCase {

    private static final AnimatorTestRule sAnimatorTestRule = new AnimatorTestRule();



    VolumeDialogImpl mDialog;

    View mActiveRinger;
@@ -126,6 +128,7 @@ public class VolumeDialogImplTest extends SysuiTestCase { 
    };



    private FakeFeatureFlags mFeatureFlags;

    private int mLongestHideShowAnimationDuration = 250;



    @Before

    public void setup() throws Exception {
@@ -138,6 +141,13 @@ public class VolumeDialogImplTest extends SysuiTestCase { 
        when(mPostureController.getDevicePosture())

                .thenReturn(DevicePostureController.DEVICE_POSTURE_CLOSED);



        int hideDialogDuration = mContext.getResources()

                .getInteger(R.integer.config_dialogHideAnimationDurationMs);

        int showDialogDuration = mContext.getResources()

                .getInteger(R.integer.config_dialogShowAnimationDurationMs);



        mLongestHideShowAnimationDuration = Math.max(hideDialogDuration, showDialogDuration);



        mOriginalOrientation = mContext.getResources().getConfiguration().orientation;



        mConfigurationController = new FakeConfigurationController();
@@ -717,6 +727,8 @@ public class VolumeDialogImplTest extends SysuiTestCase { 
    public void teardown() {

        cleanUp(mDialog);

        setOrientation(mOriginalOrientation);

        sAnimatorTestRule.advanceTimeBy(mLongestHideShowAnimationDuration);

        mTestableLooper.moveTimeForward(mLongestHideShowAnimationDuration);

        mTestableLooper.processAllMessages();

        reset(mPostureController);

    }