Merge "Don't show dnd suppressed icons on aod" into qt-dev (8a356a70) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconAreaController.java

+1 −4

Original line number	Original line	Diff line number	Diff line
	@@ -215,16 +215,13 @@ public class NotificationIconAreaController implements DarkReceiver,
	if (entry.isRowDismissed() && hideDismissed) {		if (entry.isRowDismissed() && hideDismissed) {
	return false;		return false;
	}		}

	if (hideRepliedMessages && entry.isLastMessageFromReply()) {		if (hideRepliedMessages && entry.isLastMessageFromReply()) {
	return false;		return false;
	}		}

	// showAmbient == show in shade but not shelf		// showAmbient == show in shade but not shelf
	if (!showAmbient && entry.shouldSuppressStatusBar()) {		if ((!showAmbient \|\| mFullyDark) && entry.shouldSuppressStatusBar()) {
	return false;		return false;
	}		}

	return true;		return true;
	}		}