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

Commit b9fe38a9 authored by Jeff DeCew's avatar Jeff DeCew
Browse files

Remove unused constructor arguments from NSSLController 

Bug: 296118689
Test: atest SystemUITests
Flag: NONE
Change-Id: I00ac71acc86c66f57f7b71249c5d533bb7a31c03
parent 9f32eb89

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java

+0 −8
Original line number Diff line number Diff line
@@ -83,7 +83,6 @@ import com.android.systemui.plugins.statusbar.NotificationSwipeActionHelper; 
import com.android.systemui.plugins.statusbar.StatusBarStateController;

import com.android.systemui.power.domain.interactor.PowerInteractor;

import com.android.systemui.res.R;

import com.android.systemui.scene.shared.flag.SceneContainerFlags;

import com.android.systemui.scene.ui.view.WindowRootView;

import com.android.systemui.shade.ShadeController;

import com.android.systemui.shade.ShadeViewController;
@@ -115,7 +114,6 @@ import com.android.systemui.statusbar.notification.collection.render.NotifStats; 
import com.android.systemui.statusbar.notification.collection.render.NotificationVisibilityProvider;

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

import com.android.systemui.statusbar.notification.dagger.SilentHeader;

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

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

import com.android.systemui.statusbar.notification.footer.shared.FooterViewRefactor;

import com.android.systemui.statusbar.notification.init.NotificationsController;
@@ -132,7 +130,6 @@ import com.android.systemui.statusbar.notification.stack.ui.viewbinder.Notificat 
import com.android.systemui.statusbar.phone.HeadsUpAppearanceController;

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

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

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

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

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

import com.android.systemui.statusbar.policy.DeviceProvisionedController;
@@ -185,7 +182,6 @@ public class NotificationStackScrollLayoutController implements Dumpable { 
    private final FalsingCollector mFalsingCollector;

    private final FalsingManager mFalsingManager;

    private final NotificationSwipeHelper.Builder mNotificationSwipeHelperBuilder;

    private final ScrimController mScrimController;

    private final NotifPipeline mNotifPipeline;

    private final NotifCollection mNotifCollection;

    private final UiEventLogger mUiEventLogger;
@@ -734,7 +730,6 @@ public class NotificationStackScrollLayoutController implements Dumpable { 
            FalsingCollector falsingCollector,

            FalsingManager falsingManager,

            NotificationSwipeHelper.Builder notificationSwipeHelperBuilder,

            ScrimController scrimController,

            GroupExpansionManager groupManager,

            @SilentHeader SectionHeaderController silentHeaderController,

            NotifPipeline notifPipeline,
@@ -743,11 +738,9 @@ public class NotificationStackScrollLayoutController implements Dumpable { 
            UiEventLogger uiEventLogger,

            NotificationRemoteInputManager remoteInputManager,

            VisibilityLocationProviderDelegator visibilityLocationProviderDelegator,

            ActiveNotificationsInteractor activeNotificationsInteractor,

            SeenNotificationsInteractor seenNotificationsInteractor,

            NotificationListViewBinder viewBinder,

            ShadeController shadeController,

            SceneContainerFlags sceneContainerFlags,

            Provider<WindowRootView> windowRootView,

            NotificationStackAppearanceInteractor stackAppearanceInteractor,

            InteractionJankMonitor jankMonitor,
@@ -790,7 +783,6 @@ public class NotificationStackScrollLayoutController implements Dumpable { 
        mFalsingCollector = falsingCollector;

        mFalsingManager = falsingManager;

        mNotificationSwipeHelperBuilder = notificationSwipeHelperBuilder;

        mScrimController = scrimController;

        mJankMonitor = jankMonitor;

        mNotificationStackSizeCalculator = notificationStackSizeCalculator;

        mGroupExpansionManager = groupManager;

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/shared/model/ShadeScrimClipping.kt

+4 −1
Original line number Diff line number Diff line
@@ -17,4 +17,7 @@ 
package com.android.systemui.statusbar.notification.stack.shared.model



/** Models the clipping rounded rectangle of the notification stack */

data class ShadeScrimClipping(val bounds: ShadeScrimBounds, val rounding: ShadeScrimRounding)
 
data class ShadeScrimClipping(

    val bounds: ShadeScrimBounds = ShadeScrimBounds(),

    val rounding: ShadeScrimRounding = ShadeScrimRounding()

)

packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutControllerTest.java

+0 −13
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ import static org.mockito.Mockito.verifyZeroInteractions; 
import static org.mockito.Mockito.when;



import static kotlinx.coroutines.flow.FlowKt.emptyFlow;

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



import android.metrics.LogMaker;

import android.platform.test.annotations.DisableFlags;
@@ -69,7 +68,6 @@ import com.android.systemui.plugins.statusbar.NotificationMenuRowPlugin; 
import com.android.systemui.plugins.statusbar.NotificationMenuRowPlugin.OnMenuEventListener;

import com.android.systemui.plugins.statusbar.StatusBarStateController;

import com.android.systemui.power.domain.interactor.PowerInteractor;

import com.android.systemui.scene.shared.flag.SceneContainerFlags;

import com.android.systemui.scene.ui.view.WindowRootView;

import com.android.systemui.shade.ShadeController;

import com.android.systemui.statusbar.LockscreenShadeTransitionController;
@@ -89,7 +87,6 @@ import com.android.systemui.statusbar.notification.collection.render.NotifStats; 
import com.android.systemui.statusbar.notification.collection.render.NotificationVisibilityProvider;

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

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.SeenNotificationsInteractor;

import com.android.systemui.statusbar.notification.footer.shared.FooterViewRefactor;

import com.android.systemui.statusbar.notification.init.NotificationsController;
@@ -100,7 +97,6 @@ import com.android.systemui.statusbar.notification.stack.NotificationSwipeHelper 
import com.android.systemui.statusbar.notification.stack.domain.interactor.NotificationStackAppearanceInteractor;

import com.android.systemui.statusbar.notification.stack.ui.viewbinder.NotificationListViewBinder;

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

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

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

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

import com.android.systemui.statusbar.policy.HeadsUpManager;
@@ -155,7 +151,6 @@ public class NotificationStackScrollLayoutControllerTest extends SysuiTestCase { 
    @Mock(answer = Answers.RETURNS_SELF)

    private NotificationSwipeHelper.Builder mNotificationSwipeHelperBuilder;

    @Mock private NotificationSwipeHelper mNotificationSwipeHelper;

    @Mock private ScrimController mScrimController;

    @Mock private GroupExpansionManager mGroupExpansionManager;

    @Mock private SectionHeaderController mSilentHeaderController;

    @Mock private NotifPipeline mNotifPipeline;
@@ -165,7 +160,6 @@ public class NotificationStackScrollLayoutControllerTest extends SysuiTestCase { 
    @Mock private NotificationRemoteInputManager mRemoteInputManager;

    @Mock private VisibilityLocationProviderDelegator mVisibilityLocationProviderDelegator;

    @Mock private ShadeController mShadeController;

    @Mock private SceneContainerFlags mSceneContainerFlags;

    @Mock private Provider<WindowRootView> mWindowRootView;

    @Mock private NotificationStackAppearanceInteractor mNotificationStackAppearanceInteractor;

    private final StackStateLogger mStackLogger = new StackStateLogger(logcatLogBuffer(),
@@ -191,10 +185,6 @@ public class NotificationStackScrollLayoutControllerTest extends SysuiTestCase { 
    private final ActiveNotificationListRepository mActiveNotificationsRepository =

            new ActiveNotificationListRepository();



    private final ActiveNotificationsInteractor mActiveNotificationsInteractor =

            new ActiveNotificationsInteractor(mActiveNotificationsRepository,

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



    private final SeenNotificationsInteractor mSeenNotificationsInteractor =

            new SeenNotificationsInteractor(mActiveNotificationsRepository);
@@ -1014,7 +1004,6 @@ public class NotificationStackScrollLayoutControllerTest extends SysuiTestCase { 
                new FalsingCollectorFake(),

                new FalsingManagerFake(),

                mNotificationSwipeHelperBuilder,

                mScrimController,

                mGroupExpansionManager,

                mSilentHeaderController,

                mNotifPipeline,
@@ -1023,11 +1012,9 @@ public class NotificationStackScrollLayoutControllerTest extends SysuiTestCase { 
                mUiEventLogger,

                mRemoteInputManager,

                mVisibilityLocationProviderDelegator,

                mActiveNotificationsInteractor,

                mSeenNotificationsInteractor,

                mViewBinder,

                mShadeController,

                mSceneContainerFlags,

                mWindowRootView,

                mNotificationStackAppearanceInteractor,

                mKosmos.getInteractionJankMonitor(),