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

Commit 191c3b44 authored by Steve Elliott's avatar Steve Elliott Committed by Automerger Merge Worker
Browse files

Merge "Collapse groups when shade is on keyguard" into tm-dev am: 6088a737 am: 26dd7d6f 

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



Change-Id: Ife41540af0835d4de8f0e61dd1fcb29ef5c34acd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cfb20d93 26dd7d6f

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) {