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

Commit bc342150 authored by Selim Cinek's avatar Selim Cinek
Browse files

Clicks on the notification group header now collapse 

Previously clicks would open the app and have a very
weird transition. We're now collapsing the notification
instead and never allowing expanded groups to be launched

Change-Id: I4ba4e5f695a8b210dd76a38db2783484b90a4f33
Fixes: 110093221
Test: add group, click on header after expanded, observe collapsing
parent b53030f9

packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationEntryManager.java

+4 −0
Original line number Diff line number Diff line
@@ -182,6 +182,10 @@ public class NotificationEntryManager implements Dumpable, NotificationInflater. 
            } else if (row.isChildInGroup() && isMenuVisible(row.getNotificationParent())) {

                row.getNotificationParent().animateTranslateNotification(0);

                return;

            } else if (row.isSummaryWithChildren() && row.areChildrenExpanded()) {

                // We never want to open the app directly if the user clicks in between

                // the notifications.

                return;

            }



            // Mark notification for one frame.

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

+8 −0
Original line number Diff line number Diff line
@@ -875,6 +875,7 @@ public class NotificationChildrenContainer extends ViewGroup { 
            ExpandableNotificationRow child = mChildren.get(childIdx);

            child.setChildrenExpanded(childrenExpanded, false);

        }

        updateHeaderTouchability();

    }



    public void setContainingNotification(ExpandableNotificationRow parent) {
@@ -1215,6 +1216,13 @@ public class NotificationChildrenContainer extends ViewGroup { 
            ExpandableNotificationRow child = mChildren.get(i);

            child.setUserLocked(userLocked && !showingAsLowPriority());

        }

        updateHeaderTouchability();

    }



    private void updateHeaderTouchability() {

        if (mNotificationHeader != null) {

            mNotificationHeader.setAcceptAllTouches(mChildrenExpanded || mUserLocked);

        }

    }



    public void onNotificationUpdated() {