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

Commit 3d7538ff authored by Lyn Han's avatar Lyn Han Committed by Android (Google) Code Review
Browse files

Merge "Run heads up manager tests without avalanche delay" into main

parents cbc5f494 c5c5bc55

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/policy/BaseHeadsUpManagerTest.java

+7 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ import com.android.systemui.res.R; 
import com.android.systemui.statusbar.notification.collection.NotificationEntry;

import com.android.systemui.statusbar.notification.collection.NotificationEntryBuilder;

import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow;

import com.android.systemui.statusbar.notification.shared.NotificationThrottleHun;

import com.android.systemui.util.concurrency.FakeExecutor;

import com.android.systemui.util.settings.FakeGlobalSettings;

import com.android.systemui.util.time.FakeSystemClock;
@@ -142,6 +143,12 @@ public class BaseHeadsUpManagerTest extends SysuiTestCase { 
        }

    }



    @Override

    public void SysuiSetup() throws Exception {

        super.SysuiSetup();

        mSetFlagsRule.disableFlags(NotificationThrottleHun.FLAG_NAME);

    }



    @Test

    public void testShowNotification_addsEntry() {

        final BaseHeadsUpManager alm = createHeadsUpManager();

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/policy/HeadsUpManagerPhoneTest.java

+3 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ import com.android.systemui.statusbar.NotificationShadeWindowController; 
import com.android.systemui.statusbar.notification.collection.NotificationEntry;

import com.android.systemui.statusbar.notification.collection.provider.VisualStabilityProvider;

import com.android.systemui.statusbar.notification.collection.render.GroupMembershipManager;

import com.android.systemui.statusbar.notification.shared.NotificationThrottleHun;

import com.android.systemui.statusbar.phone.ConfigurationControllerImpl;

import com.android.systemui.statusbar.phone.HeadsUpManagerPhone;

import com.android.systemui.statusbar.phone.KeyguardBypassController;
@@ -136,6 +137,8 @@ public class HeadsUpManagerPhoneTest extends BaseHeadsUpManagerTest { 


    @Before

    public void setUp() {

        mSetFlagsRule.disableFlags(NotificationThrottleHun.FLAG_NAME);



        when(mShadeInteractor.isAnyExpanded()).thenReturn(StateFlowKt.MutableStateFlow(false));

        final AccessibilityManagerWrapper accessibilityMgr =

                mDependency.injectMockDependency(AccessibilityManagerWrapper.class);