Merge "Hook up new pipeline so notifs are visible" into rvc-dev am: f02a4216ab (d5643358) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -651,7 +651,7 @@ public class NotificationEntryManager implements
	*/		*/
	public void updateNotifications(String reason) {		public void updateNotifications(String reason) {
	reapplyFilterAndSort(reason);		reapplyFilterAndSort(reason);
	if (mPresenter != null) {		if (mPresenter != null && !mFeatureFlags.isNewNotifPipelineRenderingEnabled()) {
	mPresenter.updateNotificationViews();		mPresenter.updateNotificationViews();
	}		}
	}		}

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

+6 −3

Original line number	Original line	Diff line number	Diff line
	@@ -142,9 +142,11 @@ class NotifViewManager @Inject constructor(
	// To attach rows we can use _this one weird trick_: if the intended view to add does not		// To attach rows we can use _this one weird trick_: if the intended view to add does not
	// have a parent, then simply add it (and its children).		// have a parent, then simply add it (and its children).
	entries.forEach { entry ->		entries.forEach { entry ->
	val listItem = rowRegistry.requireView(entry)		// TODO: We should eventually map GroupEntry's themselves to views so that we don't
			// depend on representativeEntry here which may actually be null in the future
			val listItem = rowRegistry.requireView(entry.representativeEntry!!)

	if (listItem.view.parent != null) {		if (listItem.view.parent == null) {
	listContainer.addListItem(listItem)		listContainer.addListItem(listItem)
	stabilityManager.notifyViewAddition(listItem.view)		stabilityManager.notifyViewAddition(listItem.view)
	}		}
	@@ -153,7 +155,8 @@ class NotifViewManager @Inject constructor(
	for ((idx, childEntry) in entry.children.withIndex()) {		for ((idx, childEntry) in entry.children.withIndex()) {
	val childListItem = rowRegistry.requireView(childEntry)		val childListItem = rowRegistry.requireView(childEntry)
	// Child hasn't been added yet. add it!		// Child hasn't been added yet. add it!
	if (!listItem.notificationChildren.contains(childListItem)) {		if (listItem.notificationChildren == null \|\|
			!listItem.notificationChildren.contains(childListItem)) {
	// TODO: old code here just Log.wtf()'d here. This might wreak havoc		// TODO: old code here just Log.wtf()'d here. This might wreak havoc
	if (childListItem.view.parent != null) {		if (childListItem.view.parent != null) {
	throw IllegalStateException("trying to add a notification child that " +		throw IllegalStateException("trying to add a notification child that " +

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -6478,7 +6478,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd

	private boolean hasActiveNotifications() {		private boolean hasActiveNotifications() {
	if (mFeatureFlags.isNewNotifPipelineRenderingEnabled()) {		if (mFeatureFlags.isNewNotifPipelineRenderingEnabled()) {
	return mNotifPipeline.getShadeList().isEmpty();		return !mNotifPipeline.getShadeList().isEmpty();
	} else {		} else {
	return mEntryManager.hasActiveNotifications();		return mEntryManager.hasActiveNotifications();
	}		}