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

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

Merge "Apply DND to visual effects."

parents 26a95451 5555d26b
Loading
Loading
Loading
Loading
+20 −0
Original line number Diff line number Diff line
@@ -729,6 +729,26 @@
                android:value="true" />
        </activity>

        <activity android:name="Settings$ZenModeVisualInterruptionSettingsActivity"
                  android:label="@string/zen_mode_visual_interruptions_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" />
                <category android:name="android.intent.category.DEFAULT" />
            </intent-filter>
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
                <category android:name="android.intent.category.DEFAULT" />
                <category android:name="com.android.settings.SHORTCUT" />
            </intent-filter>
            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                       android:value="com.android.settings.notification.ZenModeVisualInterruptionSettings" />
            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                       android:value="true" />
        </activity>

        <activity android:name="Settings$ZenModePrioritySettingsActivity"
                android:label="@string/zen_mode_priority_settings_title"
                android:icon="@drawable/ic_settings_notifications"
+15 −0
Original line number Diff line number Diff line
@@ -5964,6 +5964,9 @@
    <!-- Sound & notification > Sound section: 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>
    <!-- Sound & notification > Do not disturb section: Title for the Visual interruptions option and associated settings page. [CHAR LIMIT=30] -->
    <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>
@@ -6306,6 +6309,18 @@
    <!-- [CHAR LIMIT=NONE] Zen mode summary spoken when changing mode by voice: Turn on all notifications. -->
    <string name="zen_mode_summary_always">Change to always interrupt</string>
    <!-- [CHAR LIMIT=20] Zen mode settings: No screen interruptions option -->
    <string name="zen_mode_peek">No screen interruptions</string>
    <!-- [CHAR LIMIT=20] Zen mode settings: No screen interruptions summary -->
    <string name="zen_mode_peek_summary">Prevent notifications silenced by Do Not Disturb from peeking or appearing on the current screen</string>
    <!-- [CHAR LIMIT=20] Zen mode settings: No notification light option -->
    <string name="zen_mode_lights">No notification light</string>
    <!-- [CHAR LIMIT=20] 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>
    <!-- [CHAR LIMIT=20] Notifications settings: Apps section header -->
    <string name="notification_settings_apps_title">App notifications</string>
+7 −1
Original line number Diff line number Diff line
@@ -25,9 +25,15 @@
            android:title="@string/zen_mode_priority_settings_title"
            android:fragment="com.android.settings.notification.ZenModePrioritySettings" />

    <!-- Downtime -->
    <!-- Automated rules -->
    <PreferenceScreen
            android:key="automation_settings"
            android:title="@string/zen_mode_automation_settings_title"
            android:fragment="com.android.settings.notification.ZenModeAutomationSettings" />

    <!-- Visual interruptions -->
    <PreferenceScreen
            android:key="visual_interruptions_settings"
            android:title="@string/zen_mode_visual_interruptions_settings_title"
            android:fragment="com.android.settings.notification.ZenModeVisualInterruptionSettings" />
</PreferenceScreen>
+31 −0
Original line number 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/zen_mode_visual_interruptions_settings_title" >

    <SwitchPreference android:key="peek"
                      android:title="@string/zen_mode_peek"
                      android:summary="@string/zen_mode_peek_summary"
                      android:persistent="false" />

    <SwitchPreference android:key="lights"
                      android:title="@string/zen_mode_lights"
                      android:summary="@string/zen_mode_lights_summary"
                      android:persistent="false" />

</PreferenceScreen>
+1 −0
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ public class Settings extends SettingsActivity {
    public static class ZenModeScheduleRuleSettingsActivity extends SettingsActivity { /* empty */ }
    public static class ZenModeEventRuleSettingsActivity extends SettingsActivity { /* empty */ }
    public static class ZenModeExternalRuleSettingsActivity extends SettingsActivity { /* empty */ }
    public static class ZenModeVisualInterruptionSettingsActivity extends SettingsActivity { /* empty */}
    public static class NotificationSettingsActivity extends SettingsActivity { /* empty */ }
    public static class NotificationAppListActivity extends SettingsActivity { /* empty */ }
    public static class AppNotificationSettingsActivity extends SettingsActivity { /* empty */ }
Loading