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

Commit 68bf03c9 authored by Julia Reynolds's avatar Julia Reynolds Committed by Automerger Merge Worker
Browse files

Merge "Update conversation strings" into rvc-dev am: ec330b7f 

Change-Id: I8d7b288b4565c4d6a99991f00d19e6693f761921
parents 331c47db ec330b7f

packages/SystemUI/res/layout/notification_conversation_info.xml

+4 −4
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ 
                    android:clickable="false"

                    android:focusable="false"

                    android:ellipsize="end"

                    android:maxLines="2"

                    android:maxLines="3"

                    android:textAppearance="@style/TextAppearance.NotificationImportanceDetail"/>

            </com.android.systemui.statusbar.notification.row.ButtonLinearLayout>
@@ -272,7 +272,7 @@ 
                    android:clickable="false"

                    android:focusable="false"

                    android:ellipsize="end"

                    android:maxLines="2"

                    android:maxLines="3"

                    android:textAppearance="@style/TextAppearance.NotificationImportanceDetail"/>

            </com.android.systemui.statusbar.notification.row.ButtonLinearLayout>
@@ -321,11 +321,11 @@ 
                    android:layout_height="wrap_content"

                    android:layout_marginTop="@dimen/notification_importance_button_description_top_margin"

                    android:visibility="gone"

                    android:text="@string/notification_channel_summary_low"

                    android:text="@string/notification_conversation_summary_low"

                    android:clickable="false"

                    android:focusable="false"

                    android:ellipsize="end"

                    android:maxLines="2"

                    android:maxLines="3"

                    android:textAppearance="@style/TextAppearance.NotificationImportanceDetail"/>

            </com.android.systemui.statusbar.notification.row.ButtonLinearLayout>

packages/SystemUI/res/values/strings.xml

+10 −7
Original line number Diff line number Diff line
@@ -1269,10 +1269,10 @@ 
    <string name="notification_section_header_incoming">Incoming</string>



    <!-- Section title for notifications that do not vibrate or make noise. [CHAR LIMIT=40] -->

    <string name="notification_section_header_gentle">Silent notifications</string>

    <string name="notification_section_header_gentle">Silent</string>



    <!-- Section title for notifications that vibrate or make noise. [CHAR LIMIT=40] -->

    <string name="notification_section_header_alerting">Alerting notifications</string>

    <string name="notification_section_header_alerting">Notifications</string>



    <!-- Section title for conversational notifications. [CHAR LIMIT=40] -->

    <string name="notification_section_header_conversations">Conversations</string>
@@ -1839,25 +1839,28 @@ 
    <string name="notification_silence_title">Silent</string>



    <!-- [CHAR LIMIT=100] Notification Importance title -->

    <string name="notification_alert_title">Alerting</string>

    <string name="notification_alert_title">Default</string>



    <!-- [CHAR LIMIT=100] Notification Importance title -->

    <string name="notification_bubble_title">Bubble</string>



    <!-- [CHAR LIMIT=150] Notification Importance title: low importance level summary -->

    <string name="notification_channel_summary_low">Helps you focus without sound or vibration.</string>

    <string name="notification_channel_summary_low">No sound or vibration</string>



    <!-- [CHAR LIMIT=150] Notification Importance title: low importance level summary -->

    <string name="notification_conversation_summary_low">No sound or vibration and appears lower in conversation section</string>



    <!-- [CHAR LIMIT=150] Notification Importance title: normal importance level summary -->

    <string name="notification_channel_summary_default">Gets your attention with sound or vibration.</string>

    <string name="notification_channel_summary_default">May ring or vibrate based on phone settings</string>



    <!-- [CHAR LIMIT=150] Conversation Notification Importance title: normal conversation level, with bubbling summary -->

    <string name="notification_channel_summary_default_with_bubbles">Gets your attention with sound or vibration. Conversations from <xliff:g id="app_name" example="YouTube">%1$s</xliff:g> bubble by default.</string>

    <string name="notification_channel_summary_default_with_bubbles">May ring or vibrate based on phone settings. Conversations from <xliff:g id="app_name" example="YouTube">%1$s</xliff:g> bubble by default.</string>



    <!-- [CHAR LIMIT=150] Notification Importance title: bubble level summary -->

    <string name="notification_channel_summary_bubble">Keeps your attention with a floating shortcut to this content.</string>



    <!-- [CHAR LIMIT=150] Notification Importance title: important conversation level summary -->

    <string name="notification_channel_summary_priority">Shows at top of conversation section and appears as a bubble.</string>

    <string name="notification_channel_summary_priority">Shows at top of conversation section, appears as floating bubble, displays profile picture on lock screen</string>



    <!--[CHAR LIMIT=30] Linkable text to Settings app -->

    <string name="notification_conversation_channel_settings">Settings</string>