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

Commit 9cc46244 authored by Shan Huang's avatar Shan Huang Committed by Android (Google) Code Review
Browse files

Merge "Disable ScrimControllerTest for notification_shade_blur" into main

parents 3e822d83 6e8caa66

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/NotificationShadeDepthControllerTest.kt

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.systemui.statusbar 
import android.os.IBinder

import android.platform.test.annotations.DisableFlags

import android.platform.test.annotations.EnableFlags

import android.platform.test.annotations.RequiresFlagsDisabled

import android.testing.TestableLooper.RunWithLooper

import android.view.Choreographer

import android.view.View
@@ -359,6 +360,7 @@ class NotificationShadeDepthControllerTest : SysuiTestCase() { 
    }



    @Test

    @RequiresFlagsDisabled(Flags.FLAG_NOTIFICATION_SHADE_BLUR)

    fun updateBlurCallback_setsOpaque_whenScrim() {

        scrimVisibilityCaptor.value.accept(ScrimController.OPAQUE)

        notificationShadeDepthController.updateBlurCallback.doFrame(0)

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ import java.util.Map; 
@SmallTest

// TODO(b/381263619) there are more changes and tweaks required to match the new bouncer/shade specs

// Disabling for now but it will be fixed before the flag is fully ramped up.

@DisableFlags(Flags.FLAG_BOUNCER_UI_REVAMP)

@DisableFlags({Flags.FLAG_BOUNCER_UI_REVAMP, Flags.FLAG_NOTIFICATION_SHADE_BLUR})

public class ScrimControllerTest extends SysuiTestCase {



    @Rule public Expect mExpect = Expect.create();