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

Commit 1cf01381 authored by Julia Reynolds's avatar Julia Reynolds
Browse files

Call new code path when bundle ui flag is enabled 

Test: ExpandableNotificationRowTest
Test: DraggingToExpandGroupNotifications#testDragCollapsedGroupNotifications
Flag: com.android.systemui.notification_bundle_ui
Fixes: 396727542
Change-Id: I9e16d1727cddbff1e1ed19c38d29fc8474b6feb8
parent 94d37f96

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java

+10 −2
Original line number Diff line number Diff line
@@ -2920,7 +2920,11 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
        if (mIsSummaryWithChildren && !shouldShowPublic() && allowChildExpansion

                && !mChildrenContainer.showingAsLowPriority()) {

            final boolean wasExpanded = isGroupExpanded();

            if (NotificationBundleUi.isEnabled()) {

                mGroupExpansionManager.setGroupExpanded(mEntryAdapter, userExpanded);

            } else {

                mGroupExpansionManager.setGroupExpanded(mEntry, userExpanded);

            }

            onExpansionChanged(true /* userAction */, wasExpanded);

            return;

        }
@@ -3391,8 +3395,12 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
    public void makeActionsVisibile() {

        setUserExpanded(true, true);

        if (isChildInGroup()) {

            if (NotificationBundleUi.isEnabled()) {

                mGroupExpansionManager.setGroupExpanded(mEntryAdapter, true);

            } else {

                mGroupExpansionManager.setGroupExpanded(mEntry, true);

            }

        }

        notifyHeightChanged(/* needsAnimation= */ false);

    }