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

Commit 48e43052 authored by András Kurucz's avatar András Kurucz
Browse files

Remove unusued Wallpaperinteractor dependency from the NSSL 

Bug: 364534860
Test: atest NotificationStackScrollLayoutControllerTest
Flag: EXEMPT refactor
Change-Id: I5a73ecc61fc4ad8c5c091e6ca149923b137aebdf
parent 1f9783b7

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

+0 −4
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import static com.android.server.notification.Flags.FLAG_SCREENSHARE_NOTIFICATIO 
import static com.android.systemui.log.LogBufferHelperKt.logcatLogBuffer;

import static com.android.systemui.statusbar.StatusBarState.KEYGUARD;

import static com.android.systemui.statusbar.StatusBarState.SHADE;

import static com.android.systemui.statusbar.notification.row.NotificationRowContentBinder.FLAG_CONTENT_VIEW_ALL;

import static com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayout.ROWS_ALL;



import static com.google.common.truth.Truth.assertThat;
@@ -101,7 +100,6 @@ import com.android.systemui.statusbar.policy.ResourcesSplitShadeStateController; 
import com.android.systemui.statusbar.policy.SensitiveNotificationProtectionController;

import com.android.systemui.tuner.TunerService;

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

import com.android.systemui.wallpapers.domain.interactor.WallpaperInteractor;



import org.junit.Before;

import org.junit.Test;
@@ -139,7 +137,6 @@ public class NotificationStackScrollLayoutControllerTest extends SysuiTestCase { 
    @Mock private SysuiStatusBarStateController mSysuiStatusBarStateController;

    @Mock private KeyguardBypassController mKeyguardBypassController;

    @Mock private PowerInteractor mPowerInteractor;

    @Mock private WallpaperInteractor mWallpaperInteractor;

    @Mock private NotificationLockscreenUserManager mNotificationLockscreenUserManager;

    @Mock private MetricsLogger mMetricsLogger;

    @Mock private ColorUpdateLogger mColorUpdateLogger;
@@ -867,7 +864,6 @@ public class NotificationStackScrollLayoutControllerTest extends SysuiTestCase { 
                mActivityStarter,

                new ResourcesSplitShadeStateController(),

                mSensitiveNotificationProtectionController,

                mWallpaperInteractor,

                mMagneticNotificationRowManager,

                mSectionsManager);

    }

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

+0 −8
Original line number Diff line number Diff line
@@ -137,7 +137,6 @@ import com.android.systemui.util.Assert; 
import com.android.systemui.util.ColorUtilKt;

import com.android.systemui.util.DumpUtilsKt;

import com.android.systemui.util.ListenerSet;

import com.android.systemui.wallpapers.domain.interactor.WallpaperInteractor;



import com.google.errorprone.annotations.CompileTimeConstant;
@@ -643,9 +642,6 @@ public class NotificationStackScrollLayout 
        }

    };



    @Nullable

    private WallpaperInteractor mWallpaperInteractor;



    public NotificationStackScrollLayout(Context context, AttributeSet attrs) {

        super(context, attrs, 0, 0);

        Resources res = getResources();
@@ -5816,10 +5812,6 @@ public class NotificationStackScrollLayout 
        mController.getNotificationRoundnessManager().setAnimatedChildren(mChildrenToAddAnimated);

    }



    public void setWallpaperInteractor(WallpaperInteractor wallpaperInteractor) {

        mWallpaperInteractor = wallpaperInteractor;

    }



    void addSwipedOutView(View v) {

        mSwipedOutViews.add(v);

    }

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

+0 −8
Original line number Diff line number Diff line
@@ -135,9 +135,7 @@ import com.android.systemui.statusbar.policy.ConfigurationController.Configurati 
import com.android.systemui.statusbar.policy.SensitiveNotificationProtectionController;

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

import com.android.systemui.tuner.TunerService;

import com.android.systemui.util.Compile;

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

import com.android.systemui.wallpapers.domain.interactor.WallpaperInteractor;



import java.io.PrintWriter;

import java.util.ArrayList;
@@ -215,8 +213,6 @@ public class NotificationStackScrollLayoutController implements Dumpable { 
    private final SensitiveNotificationProtectionController

            mSensitiveNotificationProtectionController;



    private final WallpaperInteractor mWallpaperInteractor;



    private View mLongPressedView;



    private final NotificationListContainerImpl mNotificationListContainer =
@@ -835,7 +831,6 @@ public class NotificationStackScrollLayoutController implements Dumpable { 
            ActivityStarter activityStarter,

            SplitShadeStateController splitShadeStateController,

            SensitiveNotificationProtectionController sensitiveNotificationProtectionController,

            WallpaperInteractor wallpaperInteractor,

            MagneticNotificationRowManager magneticNotificationRowManager,

            NotificationSectionsManager sectionsManager) {

        mView = view;
@@ -886,7 +881,6 @@ public class NotificationStackScrollLayoutController implements Dumpable { 
        mDismissibilityProvider = dismissibilityProvider;

        mActivityStarter = activityStarter;

        mSensitiveNotificationProtectionController = sensitiveNotificationProtectionController;

        mWallpaperInteractor = wallpaperInteractor;

        mView.passSplitShadeStateController(splitShadeStateController);

        mMagneticNotificationRowManager = magneticNotificationRowManager;

        mSectionsManager = sectionsManager;
@@ -991,8 +985,6 @@ public class NotificationStackScrollLayoutController implements Dumpable { 
                (changedRow, expanded) -> mView.onGroupExpandChanged(changedRow, expanded));



        mViewBinder.bindWhileAttached(mView, this);



        mView.setWallpaperInteractor(mWallpaperInteractor);

    }



    private boolean isInVisibleLocation(NotificationEntry entry) {

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

+0 −3
Original line number Diff line number Diff line
@@ -102,7 +102,6 @@ import com.android.systemui.statusbar.phone.KeyguardBypassController; 
import com.android.systemui.statusbar.phone.ScreenOffAnimationController;

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

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

import com.android.systemui.wallpapers.domain.interactor.WallpaperInteractor;



import kotlin.Unit;
@@ -156,7 +155,6 @@ public class NotificationStackScrollLayoutTest extends SysuiTestCase { 
    @Mock private NotificationStackScrollLayoutController mStackScrollLayoutController;

    @Mock private ScreenOffAnimationController mScreenOffAnimationController;

    @Mock private NotificationShelf mNotificationShelf;

    @Mock private WallpaperInteractor mWallpaperInteractor;

    @Mock private NotificationStackSizeCalculator mStackSizeCalculator;

    @Mock private StatusBarKeyguardViewManager mStatusBarKeyguardViewManager;

    @Mock private LargeScreenShadeInterpolator mLargeScreenShadeInterpolator;
@@ -226,7 +224,6 @@ public class NotificationStackScrollLayoutTest extends SysuiTestCase { 
                .thenReturn(mNotificationRoundnessManager);

        mStackScroller.setController(mStackScrollLayoutController);

        mStackScroller.setShelf(mNotificationShelf);

        mStackScroller.setWallpaperInteractor(mWallpaperInteractor);

        when(mStackScroller.getExpandHelper()).thenReturn(mExpandHelper);



        doNothing().when(mGroupExpansionManager).collapseGroups();