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

Commit f424c3fa authored by Beverly Tai's avatar Beverly Tai Committed by Android (Google) Code Review
Browse files

Merge "Replaced dnd priority setting page w/ behavior."

parents 89c81e20 ad898e69

AndroidManifest.xml

+4 −4
Original line number Diff line number Diff line
@@ -754,17 +754,17 @@ 
                       android:value="true" />

        </activity>



        <activity android:name="Settings$ZenModePrioritySettingsActivity"

                android:label="@string/zen_mode_priority_settings_title"

        <activity android:name="Settings$ZenModeBehaviorSettingsActivity"

                android:label="@string/zen_mode_behavior_settings_title"

                android:icon="@drawable/ic_settings_notifications"

                android:exported="true"

                android:taskAffinity="">

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

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

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

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

            </intent-filter>

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

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

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

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

                android:value="true" />

        </activity>

res/values/strings.xml

+21 −6
Original line number Diff line number Diff line
@@ -6689,10 +6689,25 @@ 
    </plurals>















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













    <string name="zen_mode_settings_title">Do Not Disturb preferences</string>













    <string name="zen_mode_settings_title">Do Not Disturb</string>



























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













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













    <string name="zen_mode_behavior_settings_title">Behavior</string>

























    <!-- Do not disturb: Instructions indicating what types of sounds can bypass DND. [CHAR LIMIT=30] -->













    <string name="zen_mode_behavior_allow_title">Allow sounds and vibrations from</string>

























    <!-- Do not disturb: Subtitle for DND behavior indicating no sound will get past DND. [CHAR LIMIT=30] -->













    <string name="zen_mode_behavior_no_sound">No sound</string>

























    <!-- Do not disturb: Subtitle for DND behavior indicating no sound will get past DND due to user and/or API-invoked Total Silence mode. [CHAR LIMIT=30] -->













    <string name="zen_mode_behavior_total_silence">No sound (Total Silence)</string>

























    <!-- Do not disturb: Used before specifying which sounds can bypass DND (ie: No sound except alarms and reminders). [CHAR LIMIT=30] -->













    <string name="zen_mode_behavior_no_sound_except">No sound except <xliff:g id="categories" example="alarms, media and system">%1$s</xliff:g></string>

























    <!-- Do not disturb: Specifies sounds that can bypass DND in user and/or API-invoked Alarms Only mode.  [CHAR LIMIT=30] -->













    <string name="zen_mode_behavior_alarms_only">No sound except alarms, media and system (Alarms only)</string>





























    <!--  Do not disturb: Title for the zen mode automation listing. [CHAR LIMIT=30] -->















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










@@ -7227,8 +7242,8 @@













    <!-- [CHAR LIMIT=50] Zen mode settings: Alarms option -->















    <string name="zen_mode_alarms">Alarms</string>



























    <!-- [CHAR LIMIT=50] Zen mode settings: Alarms option summary -->













    <string name="zen_mode_alarms_summary">Alarms are always a priority and make sound</string>













    <!-- [CHAR LIMIT=50] Zen mode settings: Media and system sounds option -->













    <string name="zen_mode_media_system_other">Media and system sounds</string>





























    <!-- [CHAR LIMIT=50] Zen mode settings: Reminders option -->















    <string name="zen_mode_reminders">Reminders</string>









@@ -7246,7 +7261,7 @@













    <string name="zen_mode_repeat_callers">Repeat callers</string>





























    <!-- [CHAR LIMIT=200] Zen mode settings: Repeat callers option summary -->













    <string name="zen_mode_repeat_callers_summary">If the same person calls a second time within a <xliff:g id="minutes">%d</xliff:g> minute period, allow it</string>













    <string name="zen_mode_repeat_callers_summary">If the same person calls a second time within a <xliff:g id="minutes">%d</xliff:g> minute period</string>





























    <!-- [CHAR LIMIT=20] Zen mode settings: When option -->















    <string name="zen_mode_when">Automatically turn on</string>

























res/xml/zen_mode_priority_settings.xml→res/xml/zen_mode_behavior_settings.xml



+65
−0




























Original line number
Diff line number
Diff line















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















<!--













     Copyright (C) 2015 The Android Open Source Project













     Copyright (C) 2017 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.









@@ -16,42 +16,50 @@













-->































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













    android:key="zen_mode_priority_settings"













    android:title="@string/zen_mode_priority_settings_title" >













    android:key="zen_mode_behavior_settings_page"













    android:title="@string/zen_mode_behavior_settings_title" >



























   <PreferenceCategory













       android:title="@string/zen_mode_behavior_allow_title"













       android:key="zen_mode_behavior_allow_preferences">



























       <!-- Alarms -->













       <SwitchPreference













           android:key="zen_mode_alarms"













           android:title="@string/zen_mode_alarms"/>



























       <!-- Media -->













       <SwitchPreference













           android:key="zen_mode_media"













           android:title="@string/zen_mode_media_system_other"/>































       <!-- Reminders -->















       <SwitchPreference













        android:key="reminders"













           android:key="zen_mode_reminders"















           android:title="@string/zen_mode_reminders"/>































       <!-- Events -->















       <SwitchPreference













        android:key="events"













           android:key="zen_mode_events"















           android:title="@string/zen_mode_events"/>





























    <!-- Alarms -->













    <SwitchPreference













        android:key="alarms"













        android:title="@string/zen_mode_alarms"













        android:summary="@string/zen_mode_alarms_summary"













        android:enabled="false"













        android:defaultValue="true"/>





























       <!-- Messages -->















       <DropDownPreference













        android:key="messages"













           android:key="zen_mode_messages"















           android:title="@string/zen_mode_messages"















           android:summary="%s" />































       <!-- Calls -->















       <DropDownPreference













        android:key="calls"













           android:key="zen_mode_calls"















           android:title="@string/zen_mode_calls"















           android:summary="%s" />































       <!-- Repeat callers -->















       <SwitchPreference













        android:key="repeat_callers"













           android:key="zen_mode_repeat_callers"















           android:title="@string/zen_mode_repeat_callers"/>





























   </PreferenceCategory>





























</PreferenceScreen>
























res/xml/zen_mode_settings.xml



+5
−6




























Original line number
Diff line number
Diff line








@@ -19,20 +19,19 @@













    android:key="zen_mode_settings"















    android:title="@string/zen_mode_settings_title" >





























    <!-- Priority only allows -->















    <Preference













            android:key="priority_settings"













            android:title="@string/zen_mode_priority_settings_title"













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













            android:key="zen_mode_behavior_settings"













            android:title="@string/zen_mode_behavior_settings_title"













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































    <!-- Visual interruptions -->















    <Preference













            android:key="visual_interruptions_settings"













            android:key="zen_mode_visual_interruptions_settings"















            android:title="@string/zen_mode_visual_interruptions_settings_title"















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































    <!-- Automatic rules -->















    <PreferenceCategory













        android:key="automatic_rules"













        android:key="zen_mode_automatic_rules"















        android:title="@string/zen_mode_automation_settings_title" />















</PreferenceScreen>
























src/com/android/settings/Settings.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -121,7 +121,7 @@ public class Settings extends SettingsActivity {













    public static class PrintSettingsActivity extends SettingsActivity { /* empty */ }















    public static class PrintJobSettingsActivity extends SettingsActivity { /* empty */ }















    public static class ZenModeSettingsActivity extends SettingsActivity { /* empty */ }













    public static class ZenModePrioritySettingsActivity extends SettingsActivity { /* empty */ }













    public static class ZenModeBehaviorSettingsActivity extends SettingsActivity { /* empty */ }















    public static class ZenModeAutomationSettingsActivity extends SettingsActivity { /* empty */ }















    public static class ZenModeScheduleRuleSettingsActivity extends SettingsActivity { /* empty */ }















    public static class ZenModeEventRuleSettingsActivity extends SettingsActivity { /* empty */ }