Merge "Settings: Move priority configuration to its own sub-settings page." (851532f3) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+21 −0

Original line number	Diff line number	Diff line
		@@ -666,6 +666,27 @@
		android:value="true" />
		</activity>

		<activity android:name="Settings$ZenModePrioritySettingsActivity"
		android:label="@string/zen_mode_priority_settings_title"
		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.ZenModePrioritySettings" />
		<meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
		android:resource="@id/notification_settings" />
		<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
		android:value="true" />
		</activity>

		<activity android:name="Settings$HomeSettingsActivity"
		android:label="@string/home_settings"
		android:taskAffinity="">

res/values/strings.xml

+11 −8

Original line number	Diff line number	Diff line
		@@ -5681,7 +5681,10 @@
		<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] -->
		<string name="zen_mode_settings_title">Interruptions</string>
		<string name="zen_mode_settings_title">Block interruptions</string>

		<!-- Sound & notification > Sound section: Title for the Priority interruptions option and associated settings page. [CHAR LIMIT=30] -->
		<string name="zen_mode_priority_settings_title">Priority only allows</string>

		<!-- Sound & notification > Sound section: Title for the zen mode option. [CHAR LIMIT=60] -->
		<string name="zen_mode_option_title">When calls and notifications arrive</string>
		@@ -5869,9 +5872,6 @@
		<!-- [CHAR LIMIT=30] Zen mode settings: Exit condition selection dialog, default option -->
		<string name="zen_mode_default_option">Until you turn this off</string>

		<!-- [CHAR LIMIT=40] Zen mode settings: Important category text -->
		<string name="zen_mode_important_category">Priority interruptions</string>

		<!-- [CHAR LIMIT=60] Zen mode settings: Downtime category text -->
		<string name="zen_mode_downtime_category">Downtime</string>

		@@ -5920,11 +5920,14 @@
		<!-- [CHAR LIMIT=30] Zen mode settings: From option value: Starred contacts -->
		<string name="zen_mode_from_starred">Starred contacts only</string>

		<!-- [CHAR LIMIT=50] Zen mode settings: Events option -->
		<string name="zen_mode_events">Events and reminders</string>
		<!-- [CHAR LIMIT=50] Zen mode settings: Alarms option -->
		<string name="zen_mode_alarms">Alarms</string>

		<!-- [CHAR LIMIT=80] Zen mode settings: Reminder text about alarms -->
		<string name="zen_mode_alarm_info">Alarms are always priority interruptions</string>
		<!-- [CHAR LIMIT=50] Zen mode settings: Reminders option -->
		<string name="zen_mode_reminders">Reminders</string>

		<!-- [CHAR LIMIT=50] Zen mode settings: Events option -->
		<string name="zen_mode_events">Events</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

0 → 100644

+70 −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"
		android:key="zen_mode_settings"
		android:title="@string/zen_mode_priority_settings_title" >

		<!-- Alarms -->
		<SwitchPreference
		android:key="alarms"
		android:title="@string/zen_mode_alarms"
		android:enabled="false"
		android:defaultValue="true"
		android:persistent="false"
		android:switchTextOff=""
		android:switchTextOn="" />

		<!-- Reminders -->
		<SwitchPreference
		android:key="reminders"
		android:title="@string/zen_mode_reminders"
		android:persistent="false"
		android:switchTextOff=""
		android:switchTextOn="" />

		<!-- Events -->
		<SwitchPreference
		android:key="events"
		android:title="@string/zen_mode_events"
		android:persistent="false"
		android:switchTextOff=""
		android:switchTextOn="" />

		<!-- Messages -->
		<SwitchPreference
		android:key="messages"
		android:title="@string/zen_mode_messages"
		android:persistent="false"
		android:switchTextOff=""
		android:switchTextOn="" />

		<!-- Calls -->
		<SwitchPreference
		android:key="calls"
		android:title="@string/zen_mode_calls"
		android:persistent="false"
		android:switchTextOff=""
		android:switchTextOn="" />

		<!-- Messages/calls from -->
		<com.android.settings.DropDownPreference
		android:key="starred"
		android:title="@string/zen_mode_from"
		android:persistent="false" />

		</PreferenceScreen>

res/xml/zen_mode_settings.xml

+5 −39

Original line number	Diff line number	Diff line
		@@ -25,45 +25,11 @@
		android:title="@string/zen_mode_option_title"
		android:persistent="false" />

		<PreferenceCategory
		android:key="important"
		android:title="@string/zen_mode_important_category" >

		<SwitchPreference
		android:key="events"
		android:title="@string/zen_mode_events"
		android:persistent="false"
		android:switchTextOff=""
		android:switchTextOn="" />

		<SwitchPreference
		android:key="calls"
		android:title="@string/zen_mode_calls"
		android:persistent="false"
		android:switchTextOff=""
		android:switchTextOn="" />

		<SwitchPreference
		android:key="messages"
		android:title="@string/zen_mode_messages"
		android:persistent="false"
		android:switchTextOff=""
		android:switchTextOn="" />

		<com.android.settings.DropDownPreference
		android:key="starred"
		android:title="@string/zen_mode_from"
		android:persistent="false" />

		<Preference
		android:key="alarm_info"
		android:title=""
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:textColor="?android:attr/colorForegroundInverse"
		android:selectable="false"
		android:summary="@string/zen_mode_alarm_info" />

		</PreferenceCategory>
		<!-- Priority only allows -->
		<PreferenceScreen
		android:key="priority_settings"
		android:title="@string/zen_mode_priority_settings_title"
		android:fragment="com.android.settings.notification.ZenModePrioritySettings" />

		<!-- Downtime -->
		<PreferenceCategory

src/com/android/settings/Settings.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -94,6 +94,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 NotificationSettingsActivity extends SettingsActivity { /* empty */ }
		public static class NotificationAppListActivity extends SettingsActivity { /* empty */ }
		public static class AppNotificationSettingsActivity extends SettingsActivity { /* empty */ }