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

Commit 50978b1b authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "caitlinshk-notif-autopromote-2" into main 

* changes:
  [SB][Notifs] Add PromotedNotificationsProvider to auto-promote notifs.
  [Notif] Add PromotedNotificationUi flag refactor util class.
  [Notif] Use Kosmos.activeNotificationsInteractor in many tests
parents a8ecf787 3ea12167

packages/SystemUI/aconfig/systemui.aconfig

+9 −0
Original line number Diff line number Diff line
@@ -467,6 +467,15 @@ flag { 
    bug: "361346412"

}



flag {

    name: "status_bar_notification_chips_test"

    namespace: "systemui"

    description: "Flag to enable certain features that let us test the status bar notification "

        "chips with teamfooders. This flag should *never* be released to trunkfood or nextfood."

    bug: "361346412"

}





flag {

    name: "compose_bouncer"

    namespace: "systemui"

packages/SystemUI/multivalentTests/src/com/android/systemui/back/domain/interactor/BackActionInteractorTest.kt

+2 −7
Original line number Diff line number Diff line
@@ -47,8 +47,7 @@ import com.android.systemui.shade.ShadeController 
import com.android.systemui.shade.domain.interactor.ShadeBackActionInteractor

import com.android.systemui.statusbar.NotificationShadeWindowController

import com.android.systemui.statusbar.StatusBarState

import com.android.systemui.statusbar.notification.data.repository.ActiveNotificationListRepository

import com.android.systemui.statusbar.notification.domain.interactor.ActiveNotificationsInteractor

import com.android.systemui.statusbar.notification.domain.interactor.activeNotificationsInteractor

import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager

import com.android.systemui.statusbar.policy.HeadsUpManager

import com.android.systemui.util.concurrency.FakeExecutor
@@ -61,7 +60,6 @@ import com.google.common.truth.Truth.assertThat 
import junit.framework.Assert.assertFalse

import junit.framework.Assert.assertTrue

import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.test.StandardTestDispatcher

import kotlinx.coroutines.test.runCurrent

import org.junit.Before

import org.junit.Rule
@@ -95,9 +93,6 @@ class BackActionInteractorTest : SysuiTestCase() { 
    @Mock private lateinit var onBackInvokedDispatcher: WindowOnBackInvokedDispatcher

    @Mock private lateinit var iStatusBarService: IStatusBarService

    @Mock private lateinit var headsUpManager: HeadsUpManager

    private val activeNotificationsRepository = ActiveNotificationListRepository()

    private val activeNotificationsInteractor =

        ActiveNotificationsInteractor(activeNotificationsRepository, StandardTestDispatcher())



    private val keyguardRepository = FakeKeyguardRepository()

    private val windowRootViewVisibilityInteractor: WindowRootViewVisibilityInteractor by lazy {
@@ -107,7 +102,7 @@ class BackActionInteractorTest : SysuiTestCase() { 
            keyguardRepository,

            headsUpManager,

            powerInteractor,

            activeNotificationsInteractor,

            kosmos.activeNotificationsInteractor,

            kosmos::sceneInteractor,

        )

    }

packages/SystemUI/multivalentTests/src/com/android/systemui/scene/domain/interactor/WindowRootViewVisibilityInteractorTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ import com.android.systemui.power.domain.interactor.PowerInteractor.Companion.se 
import com.android.systemui.power.domain.interactor.PowerInteractorFactory

import com.android.systemui.scene.data.repository.WindowRootViewVisibilityRepository

import com.android.systemui.statusbar.NotificationPresenter

import com.android.systemui.statusbar.notification.data.repository.ActiveNotificationListRepository

import com.android.systemui.statusbar.notification.data.repository.activeNotificationListRepository

import com.android.systemui.statusbar.notification.data.repository.setActiveNotifs

import com.android.systemui.statusbar.notification.domain.interactor.ActiveNotificationsInteractor

import com.android.systemui.statusbar.notification.init.NotificationsController
@@ -69,7 +69,7 @@ class WindowRootViewVisibilityInteractorTest : SysuiTestCase() { 
    private val notificationPresenter = mock<NotificationPresenter>()

    private val notificationsController = mock<NotificationsController>()

    private val powerInteractor = PowerInteractorFactory.create().powerInteractor

    private val activeNotificationsRepository = ActiveNotificationListRepository()

    private val activeNotificationsRepository = kosmos.activeNotificationListRepository

    private val activeNotificationsInteractor =

        ActiveNotificationsInteractor(activeNotificationsRepository, testDispatcher)

packages/SystemUI/multivalentTests/src/com/android/systemui/shade/QuickSettingsControllerImplBaseTest.java

+1 −11
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.systemui.shade;



import static kotlinx.coroutines.flow.StateFlowKt.MutableStateFlow;

import static kotlinx.coroutines.test.TestCoroutineDispatchersKt.StandardTestDispatcher;



import static org.mockito.ArgumentMatchers.any;

import static org.mockito.Mockito.doAnswer;
@@ -63,8 +62,6 @@ import com.android.systemui.statusbar.PulseExpansionHandler; 
import com.android.systemui.statusbar.QsFrameTranslateController;

import com.android.systemui.statusbar.SysuiStatusBarStateController;

import com.android.systemui.statusbar.disableflags.data.repository.FakeDisableFlagsRepository;

import com.android.systemui.statusbar.notification.data.repository.ActiveNotificationListRepository;

import com.android.systemui.statusbar.notification.domain.interactor.ActiveNotificationsInteractor;

import com.android.systemui.statusbar.notification.stack.AmbientState;

import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayoutController;

import com.android.systemui.statusbar.phone.DozeParameters;
@@ -159,8 +156,6 @@ public class QuickSettingsControllerImplBaseTest extends SysuiTestCase { 
    protected SysuiStatusBarStateController mStatusBarStateController;

    protected ShadeInteractor mShadeInteractor;



    protected ActiveNotificationsInteractor mActiveNotificationsInteractor;



    protected Handler mMainHandler;

    protected LockscreenShadeTransitionController.Callback mLockscreenShadeTransitionCallback;
@@ -204,11 +199,6 @@ public class QuickSettingsControllerImplBaseTest extends SysuiTestCase { 
                ),

                mKosmos.getShadeModeInteractor());



        mActiveNotificationsInteractor = new ActiveNotificationsInteractor(

                        new ActiveNotificationListRepository(),

                        StandardTestDispatcher(/* scheduler = */ null, /* name = */ null)

                );



        KeyguardStatusView keyguardStatusView = new KeyguardStatusView(mContext);

        keyguardStatusView.setId(R.id.keyguard_status_view);
@@ -277,7 +267,7 @@ public class QuickSettingsControllerImplBaseTest extends SysuiTestCase { 
                mock(DeviceEntryFaceAuthInteractor.class),

                mShadeRepository,

                mShadeInteractor,

                mActiveNotificationsInteractor,

                mKosmos.getActiveNotificationsInteractor(),

                new JavaAdapter(mTestScope.getBackgroundScope()),

                mCastController,

                splitShadeStateController,

packages/SystemUI/multivalentTests/src/com/android/systemui/shade/ShadeControllerImplTest.kt

+2 −6
Original line number Diff line number Diff line
@@ -35,8 +35,7 @@ import com.android.systemui.scene.domain.interactor.WindowRootViewVisibilityInte 
import com.android.systemui.scene.domain.interactor.sceneInteractor

import com.android.systemui.statusbar.CommandQueue

import com.android.systemui.statusbar.NotificationShadeWindowController

import com.android.systemui.statusbar.notification.data.repository.ActiveNotificationListRepository

import com.android.systemui.statusbar.notification.domain.interactor.ActiveNotificationsInteractor

import com.android.systemui.statusbar.notification.domain.interactor.activeNotificationsInteractor

import com.android.systemui.statusbar.notification.row.NotificationGutsManager

import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager

import com.android.systemui.statusbar.policy.DeviceProvisionedController
@@ -50,7 +49,6 @@ import com.android.systemui.util.mockito.whenever 
import com.android.systemui.util.time.FakeSystemClock

import com.google.common.truth.Truth.assertThat

import dagger.Lazy

import kotlinx.coroutines.test.StandardTestDispatcher

import org.junit.Before

import org.junit.Test

import org.junit.runner.RunWith
@@ -65,8 +63,6 @@ import org.mockito.MockitoAnnotations 
@SmallTest

class ShadeControllerImplTest : SysuiTestCase() {

    private val executor = FakeExecutor(FakeSystemClock())

    private val testDispatcher = StandardTestDispatcher()

    private val activeNotificationsRepository = ActiveNotificationListRepository()

    private val kosmos = Kosmos()

    private val testScope = kosmos.testScope
@@ -95,7 +91,7 @@ class ShadeControllerImplTest : SysuiTestCase() { 
            FakeKeyguardRepository(),

            headsUpManager,

            PowerInteractorFactory.create().powerInteractor,

            ActiveNotificationsInteractor(activeNotificationsRepository, testDispatcher),

            kosmos.activeNotificationsInteractor,

            kosmos::sceneInteractor,

        )

    }