Merge "PreparationCoordinator: inflate views inside bundles" into main (5fcede3a) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/PreparationCoordinator.java

+10 −2

Original line number	Diff line number	Diff line
		@@ -36,6 +36,7 @@ import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.statusbar.IStatusBarService;
		import com.android.systemui.statusbar.notification.collection.BundleEntry;
		import com.android.systemui.statusbar.notification.collection.GroupEntry;
		import com.android.systemui.statusbar.notification.collection.ListEntry;
		import com.android.systemui.statusbar.notification.collection.PipelineEntry;
		import com.android.systemui.statusbar.notification.collection.NotifPipeline;
		import com.android.systemui.statusbar.notification.collection.NotificationEntry;
		@@ -307,8 +308,15 @@ public class PreparationCoordinator implements Coordinator {
		private void inflateAllRequiredViews(List<PipelineEntry> entries) {
		for (int i = 0, size = entries.size(); i < size; i++) {
		PipelineEntry entry = entries.get(i);
		if (NotificationBundleUi.isEnabled() && entry instanceof BundleEntry) {
		// TODO(b/399738511) Inflate bundle views.
		if (NotificationBundleUi.isEnabled() && entry instanceof BundleEntry bundleEntry) {
		for (ListEntry listEntry : bundleEntry.getChildren()) {
		if (listEntry instanceof GroupEntry groupEntry) {
		inflateRequiredGroupViews(groupEntry);
		} else {
		NotificationEntry notifEntry = (NotificationEntry) listEntry;
		inflateRequiredNotifViews(notifEntry);
		}
		}
		} else if (entry instanceof GroupEntry) {
		GroupEntry groupEntry = (GroupEntry) entry;
		inflateRequiredGroupViews(groupEntry);