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

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

Merge changes from topic "caitlinshk-headsup-package" into main 

* changes:
  [Notifs] Rename BaseHeadsUpManager to HeadsUpManagerImpl.
  [Notifs] Create notification.headsup package; move HUN files there.
parents 11d0f4f7 82dfcef4

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

+1 −1
Original line number Diff line number Diff line
@@ -48,8 +48,8 @@ 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.domain.interactor.activeNotificationsInteractor

import com.android.systemui.statusbar.notification.headsup.HeadsUpManager

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

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

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

import com.android.systemui.util.mockito.any

import com.android.systemui.util.mockito.argumentCaptor

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

+1 −1
Original line number Diff line number Diff line
@@ -35,9 +35,9 @@ import com.android.systemui.statusbar.NotificationPresenter 
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.headsup.HeadsUpManager

import com.android.systemui.statusbar.notification.init.NotificationsController

import com.android.systemui.statusbar.notification.shared.NotificationsLiveDataStoreRefactor

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

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

import com.android.systemui.util.mockito.any

import com.android.systemui.util.mockito.argumentCaptor

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

+2 −2
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ import com.android.systemui.statusbar.SysuiStatusBarStateController; 
import com.android.systemui.statusbar.VibratorHelper;

import com.android.systemui.statusbar.notification.ConversationNotificationManager;

import com.android.systemui.statusbar.notification.DynamicPrivacyController;

import com.android.systemui.statusbar.notification.HeadsUpTouchHelper;

import com.android.systemui.statusbar.notification.headsup.HeadsUpTouchHelper;

import com.android.systemui.statusbar.notification.NotificationWakeUpCoordinator;

import com.android.systemui.statusbar.notification.NotificationWakeUpCoordinatorLogger;

import com.android.systemui.statusbar.notification.data.repository.NotificationsKeyguardViewStateRepository;
@@ -183,7 +183,7 @@ import com.android.systemui.statusbar.phone.TapAgainViewController; 
import com.android.systemui.statusbar.phone.UnlockedScreenOffAnimationController;

import com.android.systemui.statusbar.policy.CastController;

import com.android.systemui.statusbar.policy.ConfigurationController;

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

import com.android.systemui.statusbar.notification.headsup.HeadsUpManager;

import com.android.systemui.statusbar.policy.KeyguardQsUserSwitchController;

import com.android.systemui.statusbar.policy.KeyguardStateController;

import com.android.systemui.statusbar.policy.KeyguardUserSwitcherController;

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

+1 −1
Original line number Diff line number Diff line
@@ -36,10 +36,10 @@ 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.domain.interactor.activeNotificationsInteractor

import com.android.systemui.statusbar.notification.headsup.HeadsUpManager

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

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

import com.android.systemui.statusbar.policy.DeviceProvisionedController

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

import com.android.systemui.statusbar.policy.KeyguardStateController

import com.android.systemui.statusbar.window.StatusBarWindowController

import com.android.systemui.statusbar.window.StatusBarWindowControllerStore

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

+2 −2
Original line number Diff line number Diff line
@@ -26,10 +26,10 @@ import com.android.systemui.plugins.FalsingManager 
import com.android.systemui.plugins.statusbar.StatusBarStateController

import com.android.systemui.shade.domain.interactor.ShadeInteractor

import com.android.systemui.statusbar.notification.NotificationWakeUpCoordinator

import com.android.systemui.statusbar.notification.headsup.HeadsUpManager

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

import com.android.systemui.statusbar.phone.KeyguardBypassController

import com.android.systemui.statusbar.policy.ConfigurationController

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

import com.android.systemui.util.mockito.mock

import kotlinx.coroutines.flow.MutableStateFlow

import org.junit.Before
@@ -76,7 +76,7 @@ class PulseExpansionHandlerTest : SysuiTestCase() { 
                falsingManager,

                shadeInteractor,

                lockscreenShadeTransitionController,

                dumpManager

                dumpManager,

            )

    }