Merge "Remove unused HeadsUpNotificationInteractor from NPVC" into main (d59f7a1f) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -191,7 +191,6 @@ import com.android.systemui.statusbar.notification.PropertyAnimator;
		import com.android.systemui.statusbar.notification.ViewGroupFadeHelper;
		import com.android.systemui.statusbar.notification.collection.NotificationEntry;
		import com.android.systemui.statusbar.notification.domain.interactor.ActiveNotificationsInteractor;
		import com.android.systemui.statusbar.notification.domain.interactor.HeadsUpNotificationInteractor;
		import com.android.systemui.statusbar.notification.footer.shared.FooterViewRefactor;
		import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow;
		import com.android.systemui.statusbar.notification.row.ExpandableView;
		@@ -608,7 +607,6 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump
		private final PrimaryBouncerToGoneTransitionViewModel mPrimaryBouncerToGoneTransitionViewModel;
		private final SharedNotificationContainerInteractor mSharedNotificationContainerInteractor;
		private final ActiveNotificationsInteractor mActiveNotificationsInteractor;
		private final HeadsUpNotificationInteractor mHeadsUpNotificationInteractor;
		private final KeyguardTransitionInteractor mKeyguardTransitionInteractor;
		private final KeyguardInteractor mKeyguardInteractor;
		private final PowerInteractor mPowerInteractor;
		@@ -774,7 +772,6 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump
		ActivityStarter activityStarter,
		SharedNotificationContainerInteractor sharedNotificationContainerInteractor,
		ActiveNotificationsInteractor activeNotificationsInteractor,
		HeadsUpNotificationInteractor headsUpNotificationInteractor,
		ShadeAnimationInteractor shadeAnimationInteractor,
		KeyguardViewConfigurator keyguardViewConfigurator,
		DeviceEntryFaceAuthInteractor deviceEntryFaceAuthInteractor,
		@@ -809,7 +806,6 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump
		mKeyguardTransitionInteractor = keyguardTransitionInteractor;
		mSharedNotificationContainerInteractor = sharedNotificationContainerInteractor;
		mActiveNotificationsInteractor = activeNotificationsInteractor;
		mHeadsUpNotificationInteractor = headsUpNotificationInteractor;
		mKeyguardInteractor = keyguardInteractor;
		mPowerInteractor = powerInteractor;
		mKeyguardViewConfigurator = keyguardViewConfigurator;

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

+0 −16

Original line number	Diff line number	Diff line
		@@ -155,7 +155,6 @@ import com.android.systemui.statusbar.notification.NotificationWakeUpCoordinator
		import com.android.systemui.statusbar.notification.NotificationWakeUpCoordinatorLogger;
		import com.android.systemui.statusbar.notification.data.repository.NotificationsKeyguardViewStateRepository;
		import com.android.systemui.statusbar.notification.domain.interactor.ActiveNotificationsInteractor;
		import com.android.systemui.statusbar.notification.domain.interactor.HeadsUpNotificationInteractor;
		import com.android.systemui.statusbar.notification.domain.interactor.NotificationsKeyguardInteractor;
		import com.android.systemui.statusbar.notification.row.NotificationGutsManager;
		import com.android.systemui.statusbar.notification.stack.AmbientState;
		@@ -163,7 +162,6 @@ import com.android.systemui.statusbar.notification.stack.NotificationListContain
		import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayout;
		import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayoutController;
		import com.android.systemui.statusbar.notification.stack.NotificationStackSizeCalculator;
		import com.android.systemui.statusbar.notification.stack.data.repository.FakeHeadsUpNotificationRepository;
		import com.android.systemui.statusbar.notification.stack.domain.interactor.SharedNotificationContainerInteractor;
		import com.android.systemui.statusbar.phone.CentralSurfaces;
		import com.android.systemui.statusbar.phone.ConfigurationControllerImpl;
		@@ -365,13 +363,6 @@ public class NotificationPanelViewControllerBaseTest extends SysuiTestCase {
		protected TestScope mTestScope = mKosmos.getTestScope();
		protected ShadeInteractor mShadeInteractor;
		protected PowerInteractor mPowerInteractor;
		protected FakeHeadsUpNotificationRepository mFakeHeadsUpNotificationRepository =
		new FakeHeadsUpNotificationRepository();
		protected NotificationsKeyguardViewStateRepository mNotificationsKeyguardViewStateRepository =
		new NotificationsKeyguardViewStateRepository();
		protected NotificationsKeyguardInteractor mNotificationsKeyguardInteractor =
		new NotificationsKeyguardInteractor(mNotificationsKeyguardViewStateRepository);
		protected HeadsUpNotificationInteractor mHeadsUpNotificationInteractor;
		protected NotificationPanelViewController.TouchHandler mTouchHandler;
		protected ConfigurationController mConfigurationController;
		protected SysuiStatusBarStateController mStatusBarStateController;
		@@ -689,12 +680,6 @@ public class NotificationPanelViewControllerBaseTest extends SysuiTestCase {
		when(longPressHandlingView.getResources()).thenReturn(longPressHandlingViewRes);
		when(longPressHandlingViewRes.getString(anyInt())).thenReturn("");


		mHeadsUpNotificationInteractor =
		new HeadsUpNotificationInteractor(mFakeHeadsUpNotificationRepository,
		mDeviceEntryFaceAuthInteractor, mKeyguardTransitionInteractor,
		mNotificationsKeyguardInteractor, mShadeInteractor);

		mNotificationPanelViewController = new NotificationPanelViewController(
		mView,
		mMainHandler,
		@@ -769,7 +754,6 @@ public class NotificationPanelViewControllerBaseTest extends SysuiTestCase {
		mActivityStarter,
		mSharedNotificationContainerInteractor,
		mActiveNotificationsInteractor,
		mHeadsUpNotificationInteractor,
		mShadeAnimationInteractor,
		mKeyguardViewConfigurator,
		mDeviceEntryFaceAuthInteractor,