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

Commit 5ed29f98 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "fix(#Magnification): fix WindowMagnificationAnimationControllerTest...

Merge "fix(#Magnification): fix WindowMagnificationAnimationControllerTest test case fails on cf_x86_64 devices" into main am: 8eb8a951 am: 3b6bf684 am: d25f3aa7 am: 8be442c9 am: ba882dbe

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



Change-Id: I2b97cfd67dccce14e7884d2dd8c2fff9c29d0fd6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents aae1baa5 ba882dbe
Loading
Loading
Loading
Loading
+7 −6
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ import com.android.systemui.util.settings.SecureSettings;

import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Answers;
@@ -66,7 +65,6 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;

@Ignore
@LargeTest
@RunWith(AndroidTestingRunner.class)
public class WindowMagnificationAnimationControllerTest extends SysuiTestCase {
@@ -74,8 +72,11 @@ public class WindowMagnificationAnimationControllerTest extends SysuiTestCase {
    private static final float DEFAULT_SCALE = 4.0f;
    private static final float DEFAULT_CENTER_X = 400.0f;
    private static final float DEFAULT_CENTER_Y = 500.0f;
    // The duration couldn't too short, otherwise the ValueAnimator won't work in expectation.
    private static final long ANIMATION_DURATION_MS = 300;
    // The duration and period can't be too short, otherwise the ValueAnimator and
    //    Instrumentation.runOnMainSync won't work in expectation. (b/288926821)
    private static final long ANIMATION_DURATION_MS = 600;
    private static final long WAIT_FULL_ANIMATION_PERIOD = 1000;
    private static final long WAIT_INTERMEDIATE_ANIMATION_PERIOD = 250;

    private AtomicReference<Float> mCurrentScale = new AtomicReference<>((float) 0);
    private AtomicReference<Float> mCurrentCenterX = new AtomicReference<>((float) 0);
@@ -117,8 +118,8 @@ public class WindowMagnificationAnimationControllerTest extends SysuiTestCase {
        mWindowManager = spy(new TestableWindowManager(wm));
        mContext.addMockSystemService(Context.WINDOW_SERVICE, mWindowManager);

        mWaitingAnimationPeriod = 2 * ANIMATION_DURATION_MS;
        mWaitIntermediateAnimationPeriod = ANIMATION_DURATION_MS / 2;
        mWaitingAnimationPeriod = WAIT_FULL_ANIMATION_PERIOD;
        mWaitIntermediateAnimationPeriod = WAIT_INTERMEDIATE_ANIMATION_PERIOD;
        mWindowMagnificationAnimationController = new WindowMagnificationAnimationController(
                mContext, newValueAnimator());
        mController = new SpyWindowMagnificationController(mContext, mHandler,