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

Commit 6088a737 authored by Steve Elliott's avatar Steve Elliott Committed by Android (Google) Code Review
Browse files

Merge "Collapse groups when shade is on keyguard" into tm-dev

parents f0cc0532 9f962ad3

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

+8 −2
Original line number Diff line number Diff line
@@ -182,6 +182,7 @@ public class NotificationStackScrollLayoutController { 
    private final NotificationStackSizeCalculator mNotificationStackSizeCalculator;

    private final StackStateLogger mStackStateLogger;

    private final NotificationStackScrollLogger mLogger;

    private final GroupExpansionManager mGroupExpansionManager;



    private NotificationStackScrollLayout mView;

    private boolean mFadeNotificationsOnDismiss;
@@ -307,6 +308,9 @@ public class NotificationStackScrollLayoutController { 
                public void onStateChanged(int newState) {

                    mBarState = newState;

                    mView.setStatusBarState(mBarState);

                    if (newState == KEYGUARD) {

                        mGroupExpansionManager.collapseGroups();

                    }

                }



                @Override
@@ -679,8 +683,7 @@ public class NotificationStackScrollLayoutController { 
        mScrimController = scrimController;

        mJankMonitor = jankMonitor;

        mNotificationStackSizeCalculator = notificationStackSizeCalculator;

        groupManager.registerGroupExpansionChangeListener(

                (changedRow, expanded) -> mView.onGroupExpandChanged(changedRow, expanded));

        mGroupExpansionManager = groupManager;

        legacyGroupManager.registerGroupChangeListener(new OnGroupChangeListener() {

            @Override

            public void onGroupsChanged() {
@@ -813,6 +816,9 @@ public class NotificationStackScrollLayoutController { 
        }

        mView.addOnAttachStateChangeListener(mOnAttachStateChangeListener);

        mSilentHeaderController.setOnClearSectionClickListener(v -> clearSilentNotifications());



        mGroupExpansionManager.registerGroupExpansionChangeListener(

                (changedRow, expanded) -> mView.onGroupExpandChanged(changedRow, expanded));

    }



    private boolean isInVisibleLocation(NotificationEntry entry) {