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

Commit 84cffef4 authored by Jeff DeCew's avatar Jeff DeCew
Browse files

NSSL takes a Runnable instead of NotificationsController 

Bug: 296118689
Test: manual
Flag: NA
Change-Id: If790ea9ea795c602311e4c71a6b795037dfd04ea
parent 075d4e7a

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

+4 −5
Original line number Diff line number Diff line
@@ -109,7 +109,6 @@ import com.android.systemui.statusbar.notification.collection.render.GroupExpans 
import com.android.systemui.statusbar.notification.collection.render.GroupMembershipManager;

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

import com.android.systemui.statusbar.notification.footer.ui.view.FooterView;

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

import com.android.systemui.statusbar.notification.logging.NotificationLogger;

import com.android.systemui.statusbar.notification.row.ActivatableNotificationView;

import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow;
@@ -319,7 +318,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable 
        }

    };

    private NotificationStackScrollLogger mLogger;

    private NotificationsController mNotificationsController;

    private Runnable mResetUserExpandedStatesRunnable;

    private ActivityStarter mActivityStarter;

    private final int[] mTempInt2 = new int[2];

    private final HashSet<Runnable> mAnimationFinishedRunnables = new HashSet<>();
@@ -4114,7 +4113,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable 
        mAmbientState.setExpansionChanging(false);

        if (!mIsExpanded) {

            resetScrollPosition();

            mNotificationsController.resetUserExpandedStates();

            mResetUserExpandedStatesRunnable.run();

            clearTemporaryViews();

            clearUserLockedViews();

            resetAllSwipeState();
@@ -4747,8 +4746,8 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable 
        return max + getStackTranslation();

    }



    public void setNotificationsController(NotificationsController notificationsController) {

        this.mNotificationsController = notificationsController;

    public void setResetUserExpandedStatesRunnable(Runnable runnable) {

        this.mResetUserExpandedStatesRunnable = runnable;

    }



    public void setActivityStarter(ActivityStarter activityStarter) {

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

+1 −1
Original line number Diff line number Diff line
@@ -754,7 +754,7 @@ public class NotificationStackScrollLayoutController implements Dumpable { 
        mView.setController(this);

        mView.setLogger(mLogger);

        mView.setTouchHandler(new TouchHandler());

        mView.setNotificationsController(mNotificationsController);

        mView.setResetUserExpandedStatesRunnable(mNotificationsController::resetUserExpandedStates);

        mView.setActivityStarter(mActivityStarter);

        mView.setClearAllAnimationListener(this::onAnimationEnd);

        mView.setClearAllListener((selection) -> mUiEventLogger.log(

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

+1 −3
Original line number Diff line number Diff line
@@ -82,7 +82,6 @@ import com.android.systemui.statusbar.notification.collection.NotificationEntry; 
import com.android.systemui.statusbar.notification.collection.render.GroupExpansionManager;

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

import com.android.systemui.statusbar.notification.footer.ui.view.FooterView;

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

import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow;

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

import com.android.systemui.statusbar.phone.KeyguardBypassController;
@@ -116,7 +115,6 @@ public class NotificationStackScrollLayoutTest extends SysuiTestCase { 
    private AmbientState mAmbientState;

    private TestableResources mTestableResources;

    @Rule public MockitoRule mockito = MockitoJUnit.rule();

    @Mock private NotificationsController mNotificationsController;

    @Mock private SysuiStatusBarStateController mBarState;

    @Mock private GroupMembershipManager mGroupMembershipManger;

    @Mock private GroupExpansionManager mGroupExpansionManager;
@@ -193,7 +191,7 @@ public class NotificationStackScrollLayoutTest extends SysuiTestCase { 
        mStackScrollerInternal.initView(getContext(), mNotificationSwipeHelper,

                mNotificationStackSizeCalculator);

        mStackScroller = spy(mStackScrollerInternal);

        mStackScroller.setNotificationsController(mNotificationsController);

        mStackScroller.setResetUserExpandedStatesRunnable(()->{});

        mStackScroller.setEmptyShadeView(mEmptyShadeView);

        when(mStackScrollLayoutController.isHistoryEnabled()).thenReturn(true);

        when(mStackScrollLayoutController.getNotificationRoundnessManager())