diff options
4 files changed, 12 insertions, 10 deletions
diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 87c42824885d..6fe598435433 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -4097,8 +4097,10 @@ <!-- Title of the one line view of a redacted notification --> <string name="redacted_notification_single_line_title">Redacted</string> - <!-- Main text of the one line view of a redacted notification --> - <string name="redacted_notification_single_line_text">Unlock to view</string> + <!-- Main text of the one line view of a public notification --> + <string name="public_notification_single_line_text">Unlock to view</string> + <!-- Main text of the one line view of a redacted OTP notification --> + <string name="redacted_otp_notification_single_line_text">Unlock to view code</string> <!-- Content description for contextual education dialog [CHAR LIMIT=NONE] --> <string name="contextual_education_dialog_title">Contextual education</string> diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentInflater.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentInflater.java index 0c1dd2e026b6..c31f4ad5c3f1 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentInflater.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentInflater.java @@ -247,7 +247,7 @@ public class NotificationContentInflater implements NotificationRowContentBinder entry.getRanking().getSummarization()); } else { result.mPublicInflatedSingleLineViewModel = - SingleLineViewInflater.inflateRedactedSingleLineViewModel( + SingleLineViewInflater.inflatePublicSingleLineViewModel( row.getContext(), isConversation ); @@ -509,7 +509,7 @@ public class NotificationContentInflater implements NotificationRowContentBinder new Notification.Builder(packageContext, original.getChannelId()); redacted.setContentTitle(original.extras.getCharSequence(Notification.EXTRA_TITLE)); CharSequence redactedMessage = systemUiContext.getString( - R.string.redacted_notification_single_line_text + R.string.redacted_otp_notification_single_line_text ); redacted.setWhen(original.getWhen()); @@ -1362,7 +1362,7 @@ public class NotificationContentInflater implements NotificationRowContentBinder ); } else { result.mPublicInflatedSingleLineViewModel = - SingleLineViewInflater.inflateRedactedSingleLineViewModel( + SingleLineViewInflater.inflatePublicSingleLineViewModel( mContext, isConversation ); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationRowContentBinderImpl.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationRowContentBinderImpl.kt index 761d3fe91cd0..b9a3594a007e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationRowContentBinderImpl.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationRowContentBinderImpl.kt @@ -754,7 +754,7 @@ constructor( summarization = null, ) } else { - SingleLineViewInflater.inflateRedactedSingleLineViewModel( + SingleLineViewInflater.inflatePublicSingleLineViewModel( systemUiContext, entry.ranking.isConversation, ) @@ -792,7 +792,7 @@ constructor( val redacted = Notification.Builder(packageContext, original.channelId) redacted.setContentTitle(original.extras.getCharSequence(Notification.EXTRA_TITLE)) val redactedMessage = - sysUiContext.getString(R.string.redacted_notification_single_line_text) + sysUiContext.getString(R.string.redacted_otp_notification_single_line_text) if (originalStyle is MessagingStyle) { val newStyle = MessagingStyle(originalStyle.user) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/SingleLineViewInflater.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/SingleLineViewInflater.kt index b3c8f2219f4d..ea73b4ba8811 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/SingleLineViewInflater.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/SingleLineViewInflater.kt @@ -71,7 +71,7 @@ internal object SingleLineViewInflater { var contentText = if (redactText) { systemUiContext.getString( - com.android.systemui.res.R.string.redacted_notification_single_line_text + com.android.systemui.res.R.string.redacted_otp_notification_single_line_text ) } else { HybridGroupManager.resolveText(notification) @@ -120,7 +120,7 @@ internal object SingleLineViewInflater { } @JvmStatic - fun inflateRedactedSingleLineViewModel( + fun inflatePublicSingleLineViewModel( context: Context, isConversation: Boolean = false, ): SingleLineViewModel { @@ -144,7 +144,7 @@ internal object SingleLineViewInflater { com.android.systemui.res.R.string.redacted_notification_single_line_title ), context.getString( - com.android.systemui.res.R.string.redacted_notification_single_line_text + com.android.systemui.res.R.string.public_notification_single_line_text ), conversationData, ) |