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

Commit 51a41d43 authored by Julia Reynolds's avatar Julia Reynolds Committed by Android (Google) Code Review
Browse files

Merge "Split Sound & notification settings."

parents d3de0276 8c0a4238

AndroidManifest.xml

+26 −18
Original line number Original line Diff line number Diff line
@@ -859,7 +859,7 @@ 
                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.VOICE_LAUNCH" />

                <category android:name="android.intent.category.VOICE_LAUNCH" />

            </intent-filter>

            </intent-filter>

            <intent-filter android:priority="9">

            <intent-filter android:priority="10">

                <action android:name="com.android.settings.action.SETTINGS" />

                <action android:name="com.android.settings.action.SETTINGS" />

            </intent-filter>

            </intent-filter>

            <meta-data android:name="com.android.settings.category"

            <meta-data android:name="com.android.settings.category"
@@ -885,7 +885,7 @@ 
                <category android:name="android.intent.category.VOICE_LAUNCH" />

                <category android:name="android.intent.category.VOICE_LAUNCH" />

                <category android:name="com.android.settings.SHORTCUT" />

                <category android:name="com.android.settings.SHORTCUT" />

            </intent-filter>

            </intent-filter>

            <intent-filter android:priority="8">

            <intent-filter android:priority="9">

                <action android:name="com.android.settings.action.SETTINGS" />

                <action android:name="com.android.settings.action.SETTINGS" />

            </intent-filter>

            </intent-filter>

            <meta-data android:name="com.android.settings.category"

            <meta-data android:name="com.android.settings.category"
@@ -2326,8 +2326,8 @@ 
                       android:value="com.android.settings.notification.ZenAccessSettings" />

                       android:value="com.android.settings.notification.ZenAccessSettings" />

        </activity>

        </activity>





        <activity android:name="Settings$NotificationSettingsActivity"

        <activity android:name="Settings$ConfigureNotificationSettingsActivity"

                android:label="@string/notification_settings"

                android:label="@string/configure_notification_settings"

                android:icon="@drawable/ic_settings_notifications"

                android:icon="@drawable/ic_settings_notifications"

                android:exported="true"

                android:exported="true"

                android:taskAffinity="">

                android:taskAffinity="">
@@ -2340,22 +2340,18 @@ 
                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="com.android.settings.SHORTCUT" />

                <category android:name="com.android.settings.SHORTCUT" />

            </intent-filter>

            </intent-filter>

            <intent-filter android:priority="7">

                <action android:name="com.android.settings.action.SETTINGS" />

            </intent-filter>

            <meta-data android:name="com.android.settings.category"

                android:value="com.android.settings.category.device" />

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.notification.NotificationSettings" />

                android:value="com.android.settings.notification.ConfigureNotificationSettings" />

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

                android:value="true" />

                android:value="true" />

        </activity>

        </activity>





        <!-- Keep compatibility with old shortcuts. -->

        <!-- Keep compatibility with old shortcuts. -->

        <activity-alias android:name="Settings$SoundSettingsActivity"

        <activity android:name="Settings$SoundSettingsActivity"

                android:label="@string/notification_settings"

                android:label="@string/sound_settings"

                android:icon="@drawable/ic_settings_sound"

                android:taskAffinity=""

                android:taskAffinity=""

                android:targetActivity="Settings$NotificationSettingsActivity">

                android:exported="true">

            <intent-filter android:priority="1">

            <intent-filter android:priority="1">

                <action android:name="com.android.settings.SOUND_SETTINGS" />

                <action android:name="com.android.settings.SOUND_SETTINGS" />

                <action android:name="android.settings.SOUND_SETTINGS" />

                <action android:name="android.settings.SOUND_SETTINGS" />
@@ -2365,20 +2361,26 @@ 
                <action android:name="android.intent.action.MAIN" />

                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.VOICE_LAUNCH" />

                <category android:name="android.intent.category.VOICE_LAUNCH" />

                <category android:name="com.android.settings.SHORTCUT" />

            </intent-filter>

            <intent-filter android:priority="7">

                <action android:name="com.android.settings.action.SETTINGS" />

            </intent-filter>

            </intent-filter>

            <meta-data android:name="com.android.settings.category"

                       android:value="com.android.settings.category.device" />

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.notification.NotificationSettings" />

                android:value="com.android.settings.notification.SoundSettings" />

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

                android:value="true" />

                android:value="true" />

        </activity-alias>

        </activity>





        <!-- Keep compatibility with old shortcuts. -->

        <!-- Keep compatibility with old shortcuts. -->

        <activity-alias android:name="SoundSettings"

        <activity-alias android:name="SoundSettings"

                android:label="@string/notification_settings"

                android:label="@string/sound_settings"

                android:exported="true"

                android:exported="true"

                android:targetActivity="Settings$NotificationSettingsActivity">

                android:targetActivity="Settings$SoundSettingsActivity">

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.notification.NotificationSettings" />

                android:value="com.android.settings.notification.SoundSettings" />

        </activity-alias>

        </activity-alias>





        <activity android:name="Settings$OtherSoundSettingsActivity"

        <activity android:name="Settings$OtherSoundSettingsActivity"
@@ -2402,8 +2404,14 @@ 
        <!-- Show apps for which application-level notification settings are applicable -->

        <!-- Show apps for which application-level notification settings are applicable -->

        <activity android:name="Settings$NotificationAppListActivity"

        <activity android:name="Settings$NotificationAppListActivity"

                android:label="@string/app_notifications_title"

                android:label="@string/app_notifications_title"

                android:icon="@drawable/ic_settings_notifications"

                android:exported="true"

                android:exported="true"

                android:taskAffinity="">

                android:taskAffinity="">

            <intent-filter android:priority="8">

                <action android:name="com.android.settings.action.SETTINGS" />

            </intent-filter>

            <meta-data android:name="com.android.settings.category"

                       android:value="com.android.settings.category.device" />

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.applications.ManageApplications" />

                android:value="com.android.settings.applications.ManageApplications" />

        </activity>

        </activity>

res/menu/zen_settings_menu.xml

0 → 100644
+22 −0
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2015 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<menu xmlns:android="http://schemas.android.com/apk/res/android">

    <item

        android:id="@+id/zen_access"

        android:title="@string/manage_zen_access_title"

        android:showAsAction="never" />

</menu>

res/values/strings.xml

+73 −74
Original line number Original line Diff line number Diff line
@@ -5888,7 +5888,7 @@ 
    <string name="keywords_network_reset">reset restore factory</string>

    <string name="keywords_network_reset">reset restore factory</string>

    <string name="keywords_factory_data_reset">wipe delete restore clear remove</string>

    <string name="keywords_factory_data_reset">wipe delete restore clear remove</string>

    <string name="keywords_printing">printer</string>

    <string name="keywords_printing">printer</string>

    <string name="keywords_sounds_and_notifications">speaker beep</string>

    <string name="keywords_sounds">speaker beep</string>

    <string name="keywords_sounds_and_notifications_interruptions">dont don\u2019t disturb interrupt interruption break</string>

    <string name="keywords_sounds_and_notifications_interruptions">dont don\u2019t disturb interrupt interruption break</string>

    <string name="keywords_app">RAM</string>

    <string name="keywords_app">RAM</string>

    <string name="keywords_location">nearby location history reporting</string>

    <string name="keywords_location">nearby location history reporting</string>
@@ -5929,78 +5929,117 @@ 
































    <!-- Sounds and Notification -->







    <!-- Sounds and Notification -->














    <!-- Sound: Dashboard summary. [CHAR LIMIT=100] -->














    <string name="sound_settings_summary">Ringer volume at <xliff:g id="percentage" example="2">%1$s</xliff:g></string>



























    <!-- Sound & notification: Settings header. [CHAR LIMIT=30] -->







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











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



























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














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







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



























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







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











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







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



























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







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











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







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



























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







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











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







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



























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







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














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



























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














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



























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














    <string name="vibrate_when_ringing_title">Also vibrate for calls</string>



























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














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



























    <!-- Sound: 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>



























    <!-- Sound: 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>



























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














    <string name="charging_sounds_title">Charging sounds</string>



























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














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



























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














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



























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














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



























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














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



























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














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



























    <!-- Sound: 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>



























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














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



























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














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



























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














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



























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











    <string name="zen_mode_settings_title" translatable="false">@*android:string/zen_mode_feature_name</string>







    <string name="zen_mode_settings_title" translatable="false">@*android:string/zen_mode_feature_name</string>



























    <!-- Sound & notification > Sound section: Title for the Priority interruptions option and associated settings page. [CHAR LIMIT=30] -->







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











    <string name="zen_mode_priority_settings_title">Priority only allows</string>







    <string name="zen_mode_priority_settings_title">Priority only allows</string>



























    <!-- Sound & notification > Sound section: Title for the zen mode automation option and associated settings page. [CHAR LIMIT=30] -->







    <!--  Do not disturb: Title for the zen mode automation option and associated settings page. [CHAR LIMIT=30] -->











    <string name="zen_mode_automation_settings_title">Automatic rules</string>







    <string name="zen_mode_automation_settings_title">Automatic rules</string>



























    <!-- Sound & notification > Sound section: Zen mode option: Important interruptions [CHAR LIMIT=60] -->







    <!--  Do not disturb: Zen mode option: Important interruptions [CHAR LIMIT=60] -->











    <string name="zen_mode_option_important_interruptions">Priority only</string>







    <string name="zen_mode_option_important_interruptions">Priority only</string>



























    <!-- Sound & notification > Sound section: Zen mode option: Alarms only [CHAR LIMIT=60] -->







    <!--  Do not disturb: Zen mode option: Alarms only [CHAR LIMIT=60] -->











    <string name="zen_mode_option_alarms">Alarms only</string>







    <string name="zen_mode_option_alarms">Alarms only</string>



























    <!-- Sound & notification > Sound section: Zen mode option: No interruptions [CHAR LIMIT=60] -->







    <!--  Do not disturb: Zen mode option: No interruptions [CHAR LIMIT=60] -->











    <string name="zen_mode_option_no_interruptions">Total silence</string>







    <string name="zen_mode_option_no_interruptions">Total silence</string>



























    <!-- Sound & notification > Sound section: Zen mode combined summary + condition line [CHAR LIMIT=60] -->







    <!--  Do not disturb: Zen mode combined summary + condition line [CHAR LIMIT=60] -->











    <string name="zen_mode_summary_combination"><xliff:g id="mode" example="Priority only">%1$s</xliff:g>: <xliff:g id="exit condition" example="Until you turn this off">%2$s</xliff:g></string>







    <string name="zen_mode_summary_combination"><xliff:g id="mode" example="Priority only">%1$s</xliff:g>: <xliff:g id="exit condition" example="Until you turn this off">%2$s</xliff:g></string>



























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







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











    <string name="zen_mode_visual_interruptions_settings_title">Visual interruptions</string>







    <string name="zen_mode_visual_interruptions_settings_title">Visual interruptions</string>



























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














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



























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














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



























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














    <string name="vibrate_when_ringing_title">Also vibrate for calls</string>






























    <!-- Sound & notification: Notification section header [CHAR LIMIT=30] -->







    <!-- Configure Notifications Settings title. [CHAR LIMIT=30] -->











    <string name="notification_section_header">Notification</string>







    <string name="configure_notification_settings">Configure notifications</string>



























    <!-- Sound & notification: Advanced section header [CHAR LIMIT=30] -->







    <!-- Configure Notifications: Advanced section header [CHAR LIMIT=30] -->











    <string name="advanced_section_header">Advanced</string>







    <string name="advanced_section_header">Advanced</string>



























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







    <!-- Configure Notifications: Title for the pulse notification light option. [CHAR LIMIT=30] -->











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







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



























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







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











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







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



























    <!-- Sound & notification > Notification section: Value for lockscreen notifications:  all information will be







    <!-- Configure Notifications: Value for lockscreen notifications:  all information will be











         shown in notifications shown on a secure lock screen







         shown in notifications shown on a secure lock screen











         [CHAR LIMIT=50] -->







         [CHAR LIMIT=50] -->











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







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



























    <!-- Sound & notification > Notification section: Value for lockscreen notifications: sensitive information will be







    <!-- Configure Notifications: Value for lockscreen notifications: sensitive information will be











         hidden or redacted from notifications shown on a secure lock screen







         hidden or redacted from notifications shown on a secure lock screen











         [CHAR LIMIT=50] -->







         [CHAR LIMIT=50] -->











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







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



























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







    <!-- Configure Notifications: Value for lockscreen notifications: notifications will not appear on a secure lock screen











         [CHAR LIMIT=50] -->







         [CHAR LIMIT=50] -->











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







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

























@@ -6010,50 +6049,13 @@









    <!-- Security > Choose PIN/PW/Pattern > Notification redaction interstitial: Title for the screen asking the user how they want their notifications to appear when the device is locked [CHAR LIMIT=30] -->







    <!-- Security > Choose PIN/PW/Pattern > Notification redaction interstitial: Title for the screen asking the user how they want their notifications to appear when the device is locked [CHAR LIMIT=30] -->











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







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



























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







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











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







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



























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







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











    <string name="topic_notifications_title">Topic notifications</string>







    <string name="topic_notifications_title">Topic notifications</string>



























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














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



























    <!-- Sound & notification > 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>



























    <!-- Sound & notification > 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>



























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














    <string name="charging_sounds_title">Charging sounds</string>



























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














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






























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














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



























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














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



























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














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



























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














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



























    <!-- Sound & notification > 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>



























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














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



























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














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



























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














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






























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







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











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







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










@@ -6320,9 +6322,6 @@









    <!-- [CHAR LIMIT=105] Zen mode settings: No notification light summary -->







    <!-- [CHAR LIMIT=105] Zen mode settings: No notification light summary -->











    <string name="zen_mode_lights_summary">Prevent notifications silenced by Do Not Disturb from causing the light to pulse</string>







    <string name="zen_mode_lights_summary">Prevent notifications silenced by Do Not Disturb from causing the light to pulse</string>



























    <!-- [CHAR LIMIT=20] Notifications settings: Apps section header -->














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



























    <!-- [CHAR LIMIT=NONE] Content description for per-app notification







    <!-- [CHAR LIMIT=NONE] Content description for per-app notification











         settings button -->







         settings button -->











    <string name="notification_app_settings_button">Notification settings</string>







    <string name="notification_app_settings_button">Notification settings</string>

































res/xml/configure_notification_settings.xml
0 → 100644



+47
−0




























Original line number
Original line
Diff line number
Diff line














<?xml version="1.0" encoding="utf-8"?>














<!-- Copyright (C) 2015 The Android Open Source Project





























     Licensed under the Apache License, Version 2.0 (the "License");














     you may not use this file except in compliance with the License.














     You may obtain a copy of the License at





























          http://www.apache.org/licenses/LICENSE-2.0





























     Unless required by applicable law or agreed to in writing, software














     distributed under the License is distributed on an "AS IS" BASIS,














     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.














     See the License for the specific language governing permissions and














     limitations under the License.














-->





























<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"














                  xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"














        android:title="@string/configure_notification_settings"














        android:key="configure_notification_settings" >





























    <!-- Pulse notification light -->














    <SwitchPreference














            android:key="notification_pulse"














            android:title="@string/notification_pulse_title"














            android:persistent="false" />





























    <!-- When device is locked -->














    <com.android.settings.DropDownPreference














            android:key="lock_screen_notifications"














            android:title="@string/lock_screen_notifications_title"














            android:persistent="false" />





























    <PreferenceCategory














        android:key="advanced"














        android:title="@string/advanced_section_header" >





























        <!-- Notification access -->














        <Preference














                android:key="manage_notification_access"














                android:title="@string/manage_notification_access_title"














                android:persistent="false"














                android:fragment="com.android.settings.notification.NotificationAccessSettings" />





























    </PreferenceCategory>





























</PreferenceScreen>
























res/xml/notification_settings.xml→res/xml/sound_settings.xml



+13
−58


























File changed and moved.
Preview size limit exceeded, changes collapsed.