Merge "[Minimal HUN] Show always sender name in messaging hun" into main (77530687) · Commits · e / os / android_frameworks_base

core/java/android/app/Notification.java

+5 −6

Original line number	Original line	Diff line number	Diff line
	@@ -8924,10 +8924,9 @@ public class Notification implements Parcelable
	sender = stripStyling(sender);		sender = stripStyling(sender);
	}		}

	final boolean showOnlySenderName = showOnlySenderName();

	final CharSequence title;		final CharSequence title;
	boolean isConversationTitleAvailable = !showOnlySenderName && conversationTitle != null;		final boolean isConversationTitleAvailable = showConversationTitle()
			&& conversationTitle != null;
	if (isConversationTitleAvailable) {		if (isConversationTitleAvailable) {
	title = conversationTitle;		title = conversationTitle;
	} else {		} else {
	@@ -8947,10 +8946,10 @@ public class Notification implements Parcelable
	}		}
	}		}

	/** developer settings to always show sender name */		/** (b/342370742) Developer settings to show conversation title. */
	private boolean showOnlySenderName() {		private boolean showConversationTitle() {
	return SystemProperties.getBoolean(		return SystemProperties.getBoolean(
	"persist.compact_heads_up_notification.show_only_sender_name",		"persist.compact_heads_up_notification.show_conversation_title_for_group",
	false);		false);
	}		}