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

Commit 23efadfd authored by John Spurlock's avatar John Spurlock Committed by Android Git Automerger
Browse files

am 72d3c27d: Settings: Notification string tweaks. 

* commit '72d3c27d':
  Settings: Notification string tweaks.
parents 67f2cd78 72d3c27d

AndroidManifest.xml

+2 −1
Original line number Diff line number Diff line
@@ -735,7 +735,8 @@ 
        </activity>



        <activity android:name="Settings$NotificationStationActivity"

                android:label="@string/sound_category_notification_title"

                android:theme="@android:style/Theme.DeviceDefault"

                android:label="@string/notification_log_title"

                android:taskAffinity=""

                android:excludeFromRecents="true">

            <intent-filter>

res/layout/notification_log_row.xml

+4 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ 
            android:layout_toEndOf="@android:id/icon"

            android:ellipsize="end"

            android:singleLine="true"

            android:textColor="?android:attr/textColorPrimary"

            android:textAppearance="?android:attr/textAppearanceSmall"

            android:textStyle="bold"

            android:textAlignment="viewStart"
@@ -66,6 +67,7 @@ 
            android:layout_centerVertical="true"

            android:ellipsize="end"

            android:singleLine="true"

            android:textColor="?android:attr/textColorPrimary"

            android:textAppearance="?android:attr/textAppearanceSmall"

            android:textAlignment="viewEnd"

            />
@@ -79,6 +81,7 @@ 
        android:layout_marginStart="30dp"

        android:ellipsize="end"

        android:singleLine="true"

        android:textColor="?android:attr/textColorPrimary"

        android:textAppearance="?android:attr/textAppearanceSmall"

        android:textAlignment="viewStart"

        />
@@ -109,6 +112,7 @@ 
            android:layout_gravity="left|center_vertical"

            android:ellipsize="end"

            android:singleLine="true"

            android:textColor="?android:attr/textColorPrimary"

            android:textAppearance="?android:attr/textAppearanceSmall"

            android:textAlignment="viewStart"

            />

res/values/strings.xml

+39 −39
Original line number Diff line number Diff line
@@ -4113,7 +4113,7 @@ 
    <string name="untitled_apn">Untitled</string>



    <string name="sound_category_sound_title">General</string>

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

    <string name="notification_log_title">Notification log</string>



    <!-- Category title for phone call's ringtone and vibration settings in the Sound Setting.

         [CHAR LIMIT=40] -->
@@ -5081,120 +5081,120 @@ 


    <!-- Sounds and Notifications -->



    <!-- Sounds & notifications: Settings header. [CHAR LIMIT=20] -->

    <string name="notification_settings">Sounds &amp; Notifications</string>

    <!-- Sound & notifications: Settings header. [CHAR LIMIT=20] -->

    <string name="notification_settings">Sound &amp; Notifications</string>



    <!-- Sounds & notifications: Title for the option managing media volume. [CHAR LIMIT=30] -->

    <!-- Sound & notifications: Title for the option managing media volume. [CHAR LIMIT=30] -->

    <string name="media_volume_option_title">Media volume</string>



    <!-- Sounds & notifications: Title for the option managing alarm volume. [CHAR LIMIT=30] -->

    <!-- Sound & notifications: Title for the option managing alarm volume. [CHAR LIMIT=30] -->

    <string name="alarm_volume_option_title">Alarm volume</string>



    <!-- Sounds & notifications: Title for the option managing ringer volume. [CHAR LIMIT=30] -->

    <!-- Sound & notifications: Title for the option managing ringer volume. [CHAR LIMIT=30] -->

    <string name="ring_volume_option_title">Ring volume</string>



    <!-- Sounds & notifications: Title for the option managing notification volume. [CHAR LIMIT=30] -->

    <!-- Sound & notifications: Title for the option managing notification volume. [CHAR LIMIT=30] -->

    <string name="notification_volume_option_title">Notification volume</string>



    <!-- Sounds & notifications: Title for the Do not disturb option and associated settings page. [CHAR LIMIT=30] -->

    <!-- Sound & notifications: Title for the Do not disturb option and associated settings page. [CHAR LIMIT=30] -->

    <string name="zen_mode_settings_title">Do not disturb</string>



    <!-- Sounds & notifications: Title for the ringer mode option. [CHAR LIMIT=60] -->

    <!-- Sound & notifications: Title for the ringer mode option. [CHAR LIMIT=60] -->

    <string name="ringer_mode_title">When calls and notifications arrive</string>



    <!-- Sounds & notifications: Title for the ringer mode option on devices without voice. [CHAR LIMIT=30] -->

    <!-- Sound & notifications: Title for the ringer mode option on devices without voice. [CHAR LIMIT=30] -->

    <string name="ringer_mode_title_novoice">When notifications arrive</string>



    <!-- Sounds & notifications: Value for the ringer mode option when audible. [CHAR LIMIT=30] -->

    <!-- Sound & notifications: Value for the ringer mode option when audible. [CHAR LIMIT=30] -->

    <string name="ringer_mode_audible">Ring</string>



    <!-- Sounds & notifications: Value for the ringer mode option when vibrate. [CHAR LIMIT=30] -->

    <!-- Sound & notifications: Value for the ringer mode option when vibrate. [CHAR LIMIT=30] -->

    <string name="ringer_mode_vibrate">Vibrate instead of ringing</string>



    <!-- Sounds & notifications: Value for the ringer mode option when silent. [CHAR LIMIT=30] -->

    <!-- Sound & notifications: Value for the ringer mode option when silent. [CHAR LIMIT=30] -->

    <string name="ringer_mode_silent">Don\'t ring or vibrate</string>



    <!-- Sounds & notifications: Title for the option defining the phone ringtone. [CHAR LIMIT=30] -->

    <!-- Sound & notifications: Title for the option defining the phone ringtone. [CHAR LIMIT=30] -->

    <string name="ringtone_title">Phone ringtone</string>



    <!-- Sounds & notifications: Title for the option defining the default notification ringtone. [CHAR LIMIT=30] -->

    <!-- Sound & notifications: Title for the option defining the default notification ringtone. [CHAR LIMIT=30] -->

    <string name="notification_ringtone_title">Default notification ringtone</string>



    <!-- Sounds & notifications: Title for the option managing whether or not to vibrate when ringing. [CHAR LIMIT=30] -->

    <!-- Sound & notifications: Title for the option managing whether or not to vibrate when ringing. [CHAR LIMIT=30] -->

    <string name="vibrate_when_ringing_title">Vibrate when ringing</string>



    <!-- Sounds & notifications: Title for the showing notifications option and associated settings page. [CHAR LIMIT=30] -->

    <!-- Sound & notifications: Title for the showing notifications option and associated settings page. [CHAR LIMIT=30] -->

    <string name="notification_display_settings">Showing notifications</string>



    <!-- Sounds & notifications > Showing notifications: Title for the pulse notification light option. [CHAR LIMIT=30] -->

    <!-- Sound & notifications > Showing notifications: Title for the pulse notification light option. [CHAR LIMIT=30] -->

    <string name="notification_pulse_title">Pulse notification light</string>



    <!-- Sounds & notifications > Showing notifications: Title for the option controlling notifications on the lockscreen. [CHAR LIMIT=30] -->

    <!-- Sound & notifications > Showing notifications: Title for the option controlling notifications on the lockscreen. [CHAR LIMIT=30] -->

    <string name="lock_screen_notifications_title">When device is locked</string>



    <!-- Sounds & notifications > Showing notifications: Value for lockscreen notifications:  all information will be

    <!-- Sound & notifications > Showing notifications: Value for lockscreen notifications:  all information will be

         shown in notifications shown on a secure lock screen

         [CHAR LIMIT=50] -->

    <string name="lock_screen_notifications_summary_show">Show all notification content</string>



    <!-- Sounds & notifications > Showing notifications: Value for lockscreen notifications: sensitive information will be

    <!-- Sound & notifications > Showing notifications: Value for lockscreen notifications: sensitive information will be

         hidden or redacted from notifications shown on a secure lock screen

         [CHAR LIMIT=50] -->

    <string name="lock_screen_notifications_summary_hide">Hide sensitive notification content</string>



    <!-- Sounds & notifications > Showing notifications: Value for lockscreen notifications: notifications will not appear on a secure lock screen

    <!-- Sound & notifications > Showing notifications: Value for lockscreen notifications: notifications will not appear on a secure lock screen

         [CHAR LIMIT=50] -->

    <string name="lock_screen_notifications_summary_disable">Don\'t show notifications at all</string>



    <!-- Sounds & notifications > Showing notifications: Title for the option managing notification display in zen mode. [CHAR LIMIT=30] -->

    <!-- Sound & notifications > Showing notifications: Title for the option managing notification display in zen mode. [CHAR LIMIT=30] -->

    <string name="zen_mode_notifications_title">When do not disturb is on</string>



    <!-- Sounds & notifications > Showing notifications: Value for zen mode notifications: notifications will be suppressed in zen mode [CHAR LIMIT=50] -->

    <!-- Sound & notifications > Showing notifications: Value for zen mode notifications: notifications will be suppressed in zen mode [CHAR LIMIT=50] -->

    <string name="zen_mode_notifications_summary_hide">Hide new notifications from the list</string>



    <!-- Sounds & notifications > Showing notifications: Value for zen mode notifications: notifications will be displayed in zen mode [CHAR LIMIT=50] -->

    <!-- Sound & notifications > Showing notifications: Value for zen mode notifications: notifications will be displayed in zen mode [CHAR LIMIT=50] -->

    <string name="zen_mode_notifications_summary_show">Show all notifications in the list</string>



    <!-- Sounds & notifications > Showing notifications: Title for the option managing notifications per application. [CHAR LIMIT=30] -->

    <!-- Sound & notifications > Showing notifications: Title for the option managing notifications per application. [CHAR LIMIT=30] -->

    <string name="app_notifications_title">App notifications</string>



    <!-- Sounds & notifications: Title for the other sounds option and associated settings page. [CHAR LIMIT=30] -->

    <!-- Sound & notifications: Title for the other sounds option and associated settings page. [CHAR LIMIT=30] -->

    <string name="other_sound_settings">Other sounds</string>



    <!-- Sounds & notifications > Other sounds: Title for the option enabling touch sounds for dial pad tones. [CHAR LIMIT=30] -->

    <!-- Sound & notifications > Other sounds: Title for the option enabling touch sounds for dial pad tones. [CHAR LIMIT=30] -->

    <string name="dial_pad_tones_title">Dial pad tones</string>



    <!-- Sounds & notifications > Other sounds: Title for the option enabling touch sounds for screen locking sounds. [CHAR LIMIT=30] -->

    <!-- Sound & notifications > Other sounds: Title for the option enabling touch sounds for screen locking sounds. [CHAR LIMIT=30] -->

    <string name="screen_locking_sounds_title">Screen locking sounds</string>



    <!-- Sounds & notifications > Other sounds: Title for the option enabling docking sounds. [CHAR LIMIT=30] -->

    <!-- Sound & notifications > Other sounds: Title for the option enabling docking sounds. [CHAR LIMIT=30] -->

    <string name="docking_sounds_title">Docking sounds</string>



    <!-- Sounds & notifications > Other sounds: Title for the option enabling touch sounds. [CHAR LIMIT=30] -->

    <!-- Sound & notifications > Other sounds: Title for the option enabling touch sounds. [CHAR LIMIT=30] -->

    <string name="touch_sounds_title">Touch sounds</string>



    <!-- Sounds & notifications > Other sounds: Title for the option enabling haptic feedback on touch. [CHAR LIMIT=30] -->

    <!-- Sound & notifications > Other sounds: Title for the option enabling haptic feedback on touch. [CHAR LIMIT=30] -->

    <string name="vibrate_on_touch_title">Vibrate on touch</string>



    <!-- Sounds & notifications > Other sounds: Title for the option enabling dock audio media. [CHAR LIMIT=30] -->

    <!-- Sound & notifications > Other sounds: Title for the option enabling dock audio media. [CHAR LIMIT=30] -->

    <string name="dock_audio_media_title">Dock speaker plays</string>



    <!-- Sounds & notifications > Other sounds: Value for the dock audio media with value 0: disabled. [CHAR LIMIT=30] -->

    <!-- Sound & notifications > Other sounds: Value for the dock audio media with value 0: disabled. [CHAR LIMIT=30] -->

    <string name="dock_audio_media_disabled">All audio</string>



    <!-- Sounds & notifications > Other sounds: Value for the dock audio media with value 1: enabled. [CHAR LIMIT=30] -->

    <!-- Sound & notifications > Other sounds: Value for the dock audio media with value 1: enabled. [CHAR LIMIT=30] -->

    <string name="dock_audio_media_enabled">Media audio only</string>



    <!-- Sounds & notifications > Other sounds: Value for the emergency tone option with value 0: silent. [CHAR LIMIT=30] -->

    <!-- Sound & notifications > Other sounds: Value for the emergency tone option with value 0: silent. [CHAR LIMIT=30] -->

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



    <!-- Sounds & notifications > Other sounds: Value for the emergency tone option with value 1: alert. [CHAR LIMIT=30] -->

    <!-- Sound & notifications > Other sounds: Value for the emergency tone option with value 1: alert. [CHAR LIMIT=30] -->

    <string name="emergency_tone_alert">Alert</string>



    <!-- Sounds & notifications > Other sounds: Value for the emergency tone option with value 2: vibrate. [CHAR LIMIT=30] -->

    <!-- Sound & notifications > Other sounds: Value for the emergency tone option with value 2: vibrate. [CHAR LIMIT=30] -->

    <string name="emergency_tone_vibrate">Vibrate</string>



    <!-- Sounds & notifications: Title for managing notification listeners option. [CHAR LIMIT=30] -->

    <!-- Sound & notifications: Title for managing notification listeners option. [CHAR LIMIT=30] -->

    <string name="manage_notification_access_title">Notification access</string>



    <!-- Summary of preference to manage notification listeners, when none are enabled -->