Merge "Moved zenMode visual effects + automatic rule page" (295a6b42) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+20 −20

Original line number	Diff line number	Diff line
		@@ -735,42 +735,42 @@
		<category android:name="android.intent.category.DEFAULT" />
		<category android:name="com.android.settings.SHORTCUT" />
		</intent-filter>
		<intent-filter android:priority="1">
		<action android:name="android.settings.ZEN_MODE_AUTOMATION_SETTINGS" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		<intent-filter android:priority="1">
		<action android:name="android.settings.ACTION_CONDITION_PROVIDER_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.ZenModeSettings" />
		<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
		android:value="true" />
		</activity>

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

		<activity android:name="Settings$ZenModeBehaviorSettingsActivity"
		android:label="@string/zen_mode_behavior_settings_title"
		<activity android:name="Settings$ZenModeAutomationSettingsActivity"
		android:label="@string/zen_mode_automation_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_BEHAVIOR_SETTINGS" />
		<action android:name="android.settings.ZEN_MODE_AUTOMATION_SETTINGS" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		<intent-filter android:priority="1">
		<action android:name="android.settings.ACTION_CONDITION_PROVIDER_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.ZenModeBehaviorSettings" />
		android:value="com.android.settings.notification.ZenModeAutomationSettings" />
		<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
		android:value="true" />
		</activity>

res/layout/zen_rule_name.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -19,7 +19,7 @@
		android:layout_height="wrap_content" >

		<EditText
		android:id="@+id/rule_name"
		android:id="@+id/zen_mode_rule_name"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:singleLine="true"
		@@ -33,7 +33,7 @@
		</EditText>

		<TextView
		android:id="@+id/rule_name_warning"
		android:id="@+id/zen_mode_rule_name_warning"
		android:visibility="invisible"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"

res/values/strings.xml

+31 −28

Original line number	Diff line number	Diff line
		@@ -6689,12 +6689,12 @@
		<string name="boot_sounds_title">Power on sounds</string>

		<!-- Sound: Summary for the Do not Disturb option when there is no automatic rules turned on. [CHAR LIMIT=NONE]-->
		<string name="zen_mode_settings_summary_off">No automatic rules turned on</string>
		<string name="zen_mode_settings_summary_off">Never</string>

		<!-- Sound: Summary for the Do not Disturb option when at least one automatic rules turned on. [CHAR LIMIT=NONE]-->
		<plurals name="zen_mode_settings_summary_on">
		<item quantity="one">1 automatic rule turned on</item>
		<item quantity="other"><xliff:g id="on_count" example="10">%d</xliff:g> automatic rules turned on</item>
		<item quantity="one">1 rule</item>
		<item quantity="other"><xliff:g id="on_count" example="10">%d</xliff:g> rules</item>
		</plurals>

		<!-- Sound: Title for the Do not Disturb option and associated settings page. [CHAR LIMIT=50]-->
		@@ -6718,8 +6718,11 @@
		<!-- Do not disturb: Specifies sounds that can bypass DND in user and/or API-invoked Alarms Only mode. [CHAR LIMIT=100] -->
		<string name="zen_mode_behavior_alarms_only">No sound except alarms, media and system feedback (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>
		<!-- Do not disturb: Title for the zen mode automation option in Settings. [CHAR LIMIT=40] -->
		<string name="zen_mode_automation_settings_title">Turn on automatically</string>

		<!-- Do not disturb: Title for the zen mode automatic rules page in settings. [CHAR LIMIT=30] -->
		<string name="zen_mode_automation_settings_page_title">Automatic rules</string>

		<!-- Do not disturb: Title for the zen mode automation option Suggestion. [CHAR LIMIT=50] -->
		<string name="zen_mode_automation_suggestion_title">Set Do Not Disturb rules</string>
		@@ -6742,6 +6745,12 @@
		<!-- Do not disturb: Title for the Visual interruptions option and associated settings page. [CHAR LIMIT=30] -->
		<string name="zen_mode_visual_interruptions_settings_title">Block visual disturbances</string>

		<!-- Do not disturb: Subtitle for the Visual signals option to toggle on/off visual signals/alerts when the screen is on/when screen is off. [CHAR LIMIT=30] -->
		<string name="zen_mode_visual_signals_settings_subtitle">Allow visual signals</string>

		<!-- Do not disturb: Button to add new automatic rule to DND. [CHAR LIMIT=30] -->
		<string name="zen_mode_add">Add</string>

		<!-- Work Sounds: Work sound settings section header. [CHAR LIMIT=50] -->
		<string name="sound_work_settings">Work profile sounds</string>

		@@ -7129,7 +7138,13 @@
		<string name="zen_mode_rule_name_warning">Rule name already in use</string>

		<!-- [CHAR LIMIT=40] Zen mode settings: Add rule menu option name -->
		<string name="zen_mode_add_rule">Add more</string>
		<string name="zen_mode_add_rule">Add rule</string>

		<!-- [CHAR LIMIT=40] Zen mode settings: Add event-based rule, set rule name title -->
		<string name="zen_mode_add_event_rule">Add event rule</string>

		<!-- [CHAR LIMIT=40] Zen mode settings: Add time-based rule, set rule name title -->
		<string name="zen_mode_add_time_rule">Add time rule</string>

		<!-- [CHAR LIMIT=40] Zen mode settings: Delete rule menu option name -->
		<string name="zen_mode_delete_rule">Delete rule</string>
		@@ -7153,13 +7168,13 @@
		<string name="zen_mode_configure_rule">Configure rule</string>

		<!-- [CHAR LIMIT=40] Zen mode settings: Schedule rule type name -->
		<string name="zen_schedule_rule_type_name">Time rule</string>
		<string name="zen_schedule_rule_type_name">Time</string>

		<!-- [CHAR LIMIT=NONE] Zen mode settings: Schedule rule toast hint when enabled -->
		<string name="zen_schedule_rule_enabled_toast">Automatic rule set to turn on Do Not Disturb during specified times</string>

		<!-- [CHAR LIMIT=40] Zen mode settings: Event rule type name -->
		<string name="zen_event_rule_type_name">Event rule</string>
		<string name="zen_event_rule_type_name">Event</string>

		<!-- [CHAR LIMIT=NONE] Zen mode settings: Event rule toast hint when enabled -->
		<string name="zen_event_rule_enabled_toast">Automatic rule set to turn on Do Not Disturb during specified events</string>
		@@ -7314,28 +7329,16 @@
		<!-- [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=40] Zen mode settings: visual interruptions: screen is on: title -->
		<string name="zen_mode_screen_on">Block when screen is on</string>

		<!-- [CHAR LIMIT=130] Zen mode settings: visual interruptions: screen is on: summary -->
		<string name="zen_mode_screen_on_summary">Prevent notifications silenced by Do Not Disturb from peeking or popping on screen</string>

		<!-- [CHAR LIMIT=40] Zen mode settings: visual interruptions: screen is off: title -->
		<string name="zen_mode_screen_off">Block when screen is off</string>

		<!-- [CHAR LIMIT=40] Zen mode settings: visual signals: screen is on: title -->
		<string name="zen_mode_screen_on">When the screen is on</string>
		<!-- [CHAR LIMIT=130] Zen mode settings: visual signals: screen is on: summary -->
		<string name="zen_mode_screen_on_summary">Let notifications silenced by Do Not Disturb pop on screen</string>
		<!-- [CHAR LIMIT=40] Zen mode settings: visual signals: screen is off: title -->
		<string name="zen_mode_screen_off">When the screen is off</string>
		<!-- [CHAR LIMIT=130] Zen mode settings: visual interruptions: screen is off: summary -->
		<string name="zen_mode_screen_off_summary">Prevent notifications silenced by Do Not Disturb from turning on the screen or pulsing the notification light</string>
		<string name="zen_mode_screen_off_summary">Let notifications silenced by Do Not Disturb turn on the screen and blink the light</string>
		<!-- [CHAR LIMIT=130] Zen mode settings: visual interruptions: screen is off: summary -->
		<string name="zen_mode_screen_off_summary_no_led">Prevent notifications silenced by Do Not Disturb from turning on the screen</string>

		<!-- [CHAR LIMIT=130] Zen mode settings: visual interruptions summary -->
		<string name="zen_mode_all_visual_interruptions">Off</string>
		<!-- [CHAR LIMIT=130] Zen mode settings: visual interruptions summary -->
		<string name="zen_mode_screen_on_visual_interruptions">When screen is on</string>
		<!-- [CHAR LIMIT=130] Zen mode settings: visual interruptions summary -->
		<string name="zen_mode_screen_off_visual_interruptions">When screen is off</string>
		<!-- [CHAR LIMIT=130] Zen mode settings: visual interruptions summary -->
		<string name="zen_mode_no_visual_interruptions">When screen is on or off</string>
		<string name="zen_mode_screen_off_summary_no_led">Let notifications silenced by Do Not Disturb turn on the screen</string>

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

res/xml/zen_mode_visual_interruptions_settings.xml→res/xml/zen_mode_automation_settings.xml

+5 −14

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.
		@@ -15,18 +16,8 @@
		-->

		<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"
		android:key="zen_mode_visual_interruptions_screen">

		<SwitchPreference android:key="screenOn"
		android:title="@string/zen_mode_screen_on"
		android:summary="@string/zen_mode_screen_on_summary" />

		<SwitchPreference android:key="screenOff"
		android:title="@string/zen_mode_screen_off"
		android:summary="@string/zen_mode_screen_off_summary" />


		android:key="zen_mode_automation_settings_page"
		android:title="@string/zen_mode_automation_settings_page_title" >

		<!-- Rules added at runtime -->
		</PreferenceScreen>

res/xml/zen_mode_behavior_settings.xml

+19 −2

Original line number	Diff line number	Diff line
		@@ -15,9 +15,12 @@
		limitations under the License.
		-->

		<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
		<PreferenceScreen
		xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
		android:key="zen_mode_behavior_settings_page"
		android:title="@string/zen_mode_behavior_settings_title" >
		android:title="@string/zen_mode_behavior_settings_title"
		settings:initialExpandedChildrenCount="7">

		<PreferenceCategory
		android:title="@string/zen_mode_behavior_allow_title"
		@@ -62,4 +65,18 @@

		</PreferenceCategory>

		<PreferenceCategory
		android:title="@string/zen_mode_visual_signals_settings_subtitle"
		android:key="zen_mode_visual_signals_preferences">

		<SwitchPreference android:key="zen_mode_screen_on"
		android:title="@string/zen_mode_screen_on"
		android:summary="@string/zen_mode_screen_on_summary" />

		<SwitchPreference android:key="zen_mode_screen_off"
		android:title="@string/zen_mode_screen_off"
		android:summary="@string/zen_mode_screen_off_summary" />

		</PreferenceCategory>

		</PreferenceScreen>