Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c42670c authored by Nate Myren's avatar Nate Myren
Browse files

Update redacted otp message string 

It now says "unlock to view code" rather than "unlock to view". The
standard, single line message says "unlock to view"

Fixes: 390481841
Test: manual
Flag: EXEMPT minor string change
Change-Id: I918d2a2a3c493fb66a7b9a365780111ae3ee1542
parent 8e9b6708

packages/SystemUI/res/values/strings.xml

+4 −2
Original line number Diff line number Diff line
@@ -4092,8 +4092,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>

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentInflater.java

+3 −3
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ public class NotificationContentInflater implements NotificationRowContentBinder 
                                entry.getRanking().getSummarization());

            } else {

                result.mPublicInflatedSingleLineViewModel =

                        SingleLineViewInflater.inflateRedactedSingleLineViewModel(

                        SingleLineViewInflater.inflatePublicSingleLineViewModel(

                                row.getContext(),

                                isConversation

                        );
@@ -508,7 +508,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());
@@ -1361,7 +1361,7 @@ public class NotificationContentInflater implements NotificationRowContentBinder 
                            );

                } else {

                    result.mPublicInflatedSingleLineViewModel =

                            SingleLineViewInflater.inflateRedactedSingleLineViewModel(

                            SingleLineViewInflater.inflatePublicSingleLineViewModel(

                                    mContext,

                                    isConversation

                            );

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationRowContentBinderImpl.kt

+2 −2
Original line number Diff line number Diff line
@@ -752,7 +752,7 @@ constructor( 
                            summarization = null,

                        )

                    } else {

                        SingleLineViewInflater.inflateRedactedSingleLineViewModel(

                        SingleLineViewInflater.inflatePublicSingleLineViewModel(

                            systemUiContext,

                            entry.ranking.isConversation,

                        )
@@ -790,7 +790,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)

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/SingleLineViewInflater.kt

+3 −3
Original line number Diff line number Diff line
@@ -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,

        )