Merge "Settings: Move downtime to new automation sub-settings page." (385c5acb) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+21 −0

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

		<activity android:name="Settings$ZenModeAutomationSettingsActivity"
		android:label="@string/zen_mode_automation_settings_title"
		android:exported="true"
		android:taskAffinity="">
		<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>
		<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.ZenModeAutomationSettings" />
		<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

+3 −0

Original line number	Diff line number	Diff line
		@@ -5689,6 +5689,9 @@
		<!-- 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 automation option and associated settings page. [CHAR LIMIT=30] -->
		<string name="zen_mode_automation_settings_title">Automatic rules</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>

res/xml/zen_mode_automation_settings.xml

0 → 100644

+61 −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_automation_settings_title" >

		<!-- Downtime -->
		<PreferenceCategory
		android:key="downtime"
		android:title="@string/zen_mode_downtime_category" >

		<!-- Days -->
		<Preference
		android:key="days"
		android:title="@string/zen_mode_downtime_days"
		android:persistent="false" />

		<!-- Start time/End time added and removed here! :-) -->

		<!-- Interruptions allowed -->
		<com.android.settings.DropDownPreference
		android:key="downtime_mode"
		android:title="@string/zen_mode_downtime_mode_title"
		android:order="100"
		android:persistent="false" />

		</PreferenceCategory>

		<PreferenceCategory
		android:key="automation"
		android:title="@string/zen_mode_automation_category" >

		<Preference
		android:key="entry"
		android:title="@string/zen_mode_entry_conditions_title"
		android:persistent="false" />

		<Preference
		android:key="manage_condition_providers"
		android:title="@string/manage_condition_providers"
		android:persistent="false"
		android:fragment="com.android.settings.notification.ConditionProviderSettings" />

		</PreferenceCategory>

		</PreferenceScreen>

res/xml/zen_mode_settings.xml

+4 −37

Original line number	Diff line number	Diff line
		@@ -32,41 +32,8 @@
		android:fragment="com.android.settings.notification.ZenModePrioritySettings" />

		<!-- Downtime -->
		<PreferenceCategory
		android:key="downtime"
		android:title="@string/zen_mode_downtime_category" >

		<!-- Days -->
		<Preference
		android:key="days"
		android:title="@string/zen_mode_downtime_days"
		android:persistent="false" />

		<!-- Start time/End time added and removed here! :-) -->

		<!-- Interruptions allowed -->
		<com.android.settings.DropDownPreference
		android:key="downtime_mode"
		android:title="@string/zen_mode_downtime_mode_title"
		android:order="100"
		android:persistent="false" />
		</PreferenceCategory>

		<PreferenceCategory
		android:key="automation"
		android:title="@string/zen_mode_automation_category" >

		<Preference
		android:key="entry"
		android:title="@string/zen_mode_entry_conditions_title"
		android:persistent="false" />

		<Preference
		android:key="manage_condition_providers"
		android:title="@string/manage_condition_providers"
		android:persistent="false"
		android:fragment="com.android.settings.notification.ConditionProviderSettings" />

		</PreferenceCategory>

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

src/com/android/settings/Settings.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -95,6 +95,7 @@ public class Settings extends SettingsActivity {
		public static class PrintJobSettingsActivity extends SettingsActivity { /* empty */ }
		public static class ZenModeSettingsActivity extends SettingsActivity { /* empty */ }
		public static class ZenModePrioritySettingsActivity extends SettingsActivity { /* empty */ }
		public static class ZenModeAutomationSettingsActivity extends SettingsActivity { /* empty */ }
		public static class NotificationSettingsActivity extends SettingsActivity { /* empty */ }
		public static class NotificationAppListActivity extends SettingsActivity { /* empty */ }
		public static class AppNotificationSettingsActivity extends SettingsActivity { /* empty */ }