Merge "Fixed failing scrim test" into sc-v2-dev am: 4c7e68f17a am: 40eeba9c86

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15674916 Change-Id: Ie69d2e458607dfdd08abd0bf18584b346d4a4eb6
2021-08-25 16:01:49 +00:00
parent 60a7931da6 40eeba9c86
commit 414fdde676
1 changed files with 0 additions and 6 deletions
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java
@@ -751,12 +751,6 @@ public class ScrimControllerTest extends SysuiTestCase {
        finishAnimationsImmediately();
        mScrimController.transitionTo(ScrimState.UNLOCKED);

-        // Immediately tinted black after the transition starts
-        assertScrimTinted(Map.of(
-                mScrimInFront, true,
-                mScrimBehind, true
-        ));
-
        finishAnimationsImmediately();

        // All scrims should be transparent at the end of fade transition.