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

Commit b7e8bcbc authored by Caitlin Shkuratov's avatar Caitlin Shkuratov Committed by Automerger Merge Worker
Browse files

Merge "[Central Surfaces] Remove unused CentralSurfaces from NSSLC." into... 

Merge "[Central Surfaces] Remove unused CentralSurfaces from NSSLC." into udc-qpr-dev am: 6f4622fd

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23662649



Change-Id: I15de5ad9a3da9770996200ad992117950a941afb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 172ff2ba 6f4622fd

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

+0 −5
Original line number Diff line number Diff line
@@ -112,7 +112,6 @@ import com.android.systemui.statusbar.notification.row.NotificationGutsManager; 
import com.android.systemui.statusbar.notification.row.NotificationSnooze;

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

import com.android.systemui.statusbar.notification.stack.ui.viewmodel.NotificationListViewModel;

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

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

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

import com.android.systemui.statusbar.phone.HeadsUpTouchHelper;
@@ -179,8 +178,6 @@ public class NotificationStackScrollLayoutController { 
    private final KeyguardInteractor mKeyguardInteractor;

    private final PrimaryBouncerInteractor mPrimaryBouncerInteractor;

    private final NotificationLockscreenUserManager mLockscreenUserManager;

    // TODO: CentralSurfaces should be encapsulated behind a Controller

    private final CentralSurfaces mCentralSurfaces;

    private final SectionHeaderController mSilentHeaderController;

    private final LockscreenShadeTransitionController mLockscreenShadeTransitionController;

    private final InteractionJankMonitor mJankMonitor;
@@ -645,7 +642,6 @@ public class NotificationStackScrollLayoutController { 
            FalsingManager falsingManager,

            @Main Resources resources,

            NotificationSwipeHelper.Builder notificationSwipeHelperBuilder,

            CentralSurfaces centralSurfaces,

            ScrimController scrimController,

            GroupExpansionManager groupManager,

            @SilentHeader SectionHeaderController silentHeaderController,
@@ -696,7 +692,6 @@ public class NotificationStackScrollLayoutController { 
        mFalsingManager = falsingManager;

        mResources = resources;

        mNotificationSwipeHelperBuilder = notificationSwipeHelperBuilder;

        mCentralSurfaces = centralSurfaces;

        mScrimController = scrimController;

        mJankMonitor = jankMonitor;

        mNotificationStackSizeCalculator = notificationStackSizeCalculator;

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

+0 −3
Original line number Diff line number Diff line
@@ -79,7 +79,6 @@ import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow 
import com.android.systemui.statusbar.notification.row.NotificationGutsManager;

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

import com.android.systemui.statusbar.notification.stack.ui.viewmodel.NotificationListViewModel;

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

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

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

import com.android.systemui.statusbar.phone.NotificationIconAreaController;
@@ -132,7 +131,6 @@ public class NotificationStackScrollLayoutControllerTest extends SysuiTestCase { 
    @Mock(answer = Answers.RETURNS_SELF)

    private NotificationSwipeHelper.Builder mNotificationSwipeHelperBuilder;

    @Mock private NotificationSwipeHelper mNotificationSwipeHelper;

    @Mock private CentralSurfaces mCentralSurfaces;

    @Mock private ScrimController mScrimController;

    @Mock private GroupExpansionManager mGroupExpansionManager;

    @Mock private SectionHeaderController mSilentHeaderController;
@@ -619,7 +617,6 @@ public class NotificationStackScrollLayoutControllerTest extends SysuiTestCase { 
                new FalsingManagerFake(),

                mResources,

                mNotificationSwipeHelperBuilder,

                mCentralSurfaces,

                mScrimController,

                mGroupExpansionManager,

                mSilentHeaderController,