Merge "Call new code path when bundle ui flag is enabled" into main (f93debc2) · Commits · e / os / android_frameworks_base

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;
		}
		@@ -3399,8 +3403,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);
		}