Merge "New pipeline: remove non-silent section headers" (c14bbad1) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/ConversationCoordinator.kt

+3 −1

Original line number	Diff line number	Diff line
		@@ -48,7 +48,9 @@ class ConversationCoordinator @Inject constructor(
		val sectioner = object : NotifSectioner("People") {
		override fun isInSection(entry: ListEntry): Boolean =
		isConversation(entry.representativeEntry!!)
		override fun getHeaderNodeController() = peopleHeaderController
		override fun getHeaderNodeController() =
		// TODO: remove SHOW_ALL_SECTIONS, this redundant method, and peopleHeaderController
		if (RankingCoordinator.SHOW_ALL_SECTIONS) peopleHeaderController else null
		}

		override fun attach(pipeline: NotifPipeline) {

+5 −1

Original line number	Diff line number	Diff line
		@@ -205,8 +205,12 @@ public class HeadsUpCoordinator implements Coordinator {
		@Nullable
		@Override
		public NodeController getHeaderNodeController() {
		// TODO: remove SHOW_ALL_SECTIONS, this redundant method, and mIncomingHeaderController
		if (RankingCoordinator.SHOW_ALL_SECTIONS) {
		return mIncomingHeaderController;
		}
		return null;
		}
		};

		private final OnHeadsUpChangedListener mOnHeadsUpChangedListener =

+6 −1

Original line number	Diff line number	Diff line
		@@ -41,6 +41,7 @@ import javax.inject.Inject;
		*/
		@SysUISingleton
		public class RankingCoordinator implements Coordinator {
		public static final boolean SHOW_ALL_SECTIONS = false;
		private final StatusBarStateController mStatusBarStateController;
		private final HighPriorityProvider mHighPriorityProvider;
		private final NodeController mSilentHeaderController;
		@@ -83,8 +84,12 @@ public class RankingCoordinator implements Coordinator {
		@Nullable
		@Override
		public NodeController getHeaderNodeController() {
		// TODO: remove SHOW_ALL_SECTIONS, this redundant method, and mAlertingHeaderController
		if (SHOW_ALL_SECTIONS) {
		return mAlertingHeaderController;
		}
		return null;
		}
		};

		private final NotifSectioner mSilentNotifSectioner = new NotifSectioner("Silent") {