Merge "Settings: New DND access settings page." into mnc-dev (7b998977) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+18 −1

Original line number	Diff line number	Diff line
		@@ -2251,7 +2251,24 @@
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		android:value="com.android.settings.notification.NotificationAccessSettings" />
		<meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
		android:resource="@id/security_settings" />
		android:resource="@id/notification_settings" />
		</activity>

		<activity android:name="Settings$ZenAccessSettingsActivity"
		android:label="@string/manage_zen_access_title"
		android:taskAffinity="">
		<intent-filter android:priority="1">
		<action android:name="android.settings.ZEN_ACCESS_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" />
		</intent-filter>
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		android:value="com.android.settings.notification.ZenAccessSettings" />
		<meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
		android:resource="@id/notification_settings" />
		</activity>

		<activity android:name="Settings$NotificationSettingsActivity"

res/values/strings.xml

+10 −1

Original line number	Diff line number	Diff line
		@@ -5934,6 +5934,9 @@
		<!-- Sound & notification: Notification section header [CHAR LIMIT=30] -->
		<string name="notification_section_header">Notification</string>

		<!-- Sound & notification: Advanced section header [CHAR LIMIT=30] -->
		<string name="advanced_section_header">Advanced</string>

		<!-- Sound & notification > Notification section: Title for the pulse notification light option. [CHAR LIMIT=30] -->
		<string name="notification_pulse_title">Pulse notification light</string>

		@@ -5999,7 +6002,7 @@
		<!-- Sound & notification > Other sounds: Value for the emergency tone option with value 2: vibrate. [CHAR LIMIT=30] -->
		<string name="emergency_tone_vibrate">Vibrate</string>

		<!-- Sound & notification > Notification section: Title for managing notification listeners option. [CHAR LIMIT=30] -->
		<!-- Sound & notification > Advanced section: Title for managing notification listeners option. [CHAR LIMIT=30] -->
		<string name="manage_notification_access_title">Notification access</string>

		<!-- Summary of preference to manage notification listeners, when none are enabled -->
		@@ -6028,6 +6031,12 @@
		to dismiss these notifications or touch action buttons within them.
		</string>

		<!-- Sound & notification > Advanced section: Title for managing Do Not Disturb access option. [CHAR LIMIT=40] -->
		<string name="manage_zen_access_title">Do Not Disturb access</string>

		<!-- Sound & notification > Do Not Disturb access > Text to display when the list is empty. [CHAR LIMIT=NONE] -->
		<string name="zen_access_empty_text">No installed apps have requested Do Not Disturb access</string>

		<!-- [CHAR LIMIT=NONE] Text when loading app list in notification settings -->
		<string name="loading_notification_apps">Loading apps...</string>

res/xml/notification_settings.xml

+13 −0

Original line number	Diff line number	Diff line
		@@ -120,6 +120,12 @@
		android:value="com.android.settings.Settings$NotificationAppListActivity" />
		</PreferenceScreen>

		</PreferenceCategory>

		<PreferenceCategory
		android:key="advanced"
		android:title="@string/advanced_section_header" >

		<!-- Notification access -->
		<Preference
		android:key="manage_notification_access"
		@@ -127,6 +133,13 @@
		android:persistent="false"
		android:fragment="com.android.settings.notification.NotificationAccessSettings" />

		<!-- Do Not Disturb access -->
		<Preference
		android:key="manage_zen_access"
		android:title="@string/manage_zen_access_title"
		android:persistent="false"
		android:fragment="com.android.settings.notification.ZenAccessSettings" />

		</PreferenceCategory>

		</PreferenceScreen>

src/com/android/settings/Settings.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -91,6 +91,7 @@ public class Settings extends SettingsActivity {
		public static class NotificationStationActivity extends SettingsActivity { /* empty */ }
		public static class UserSettingsActivity extends SettingsActivity { /* empty */ }
		public static class NotificationAccessSettingsActivity extends SettingsActivity { /* empty */ }
		public static class ZenAccessSettingsActivity extends SettingsActivity { /* empty */ }
		public static class ConditionProviderSettingsActivity extends SettingsActivity { /* empty */ }
		public static class UsbSettingsActivity extends SettingsActivity { /* empty */ }
		public static class TrustedCredentialsSettingsActivity extends SettingsActivity { /* empty */ }

src/com/android/settings/SettingsActivity.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -103,6 +103,7 @@ import com.android.settings.notification.NotificationAccessSettings;
		import com.android.settings.notification.NotificationSettings;
		import com.android.settings.notification.NotificationStation;
		import com.android.settings.notification.OtherSoundSettings;
		import com.android.settings.notification.ZenAccessSettings;
		import com.android.settings.notification.ZenModeEventRuleSettings;
		import com.android.settings.notification.ZenModeExternalRuleSettings;
		import com.android.settings.notification.ZenModePrioritySettings;
		@@ -328,6 +329,7 @@ public class SettingsActivity extends Activity
		DreamSettings.class.getName(),
		UserSettings.class.getName(),
		NotificationAccessSettings.class.getName(),
		ZenAccessSettings.class.getName(),
		PrintSettingsFragment.class.getName(),
		PrintJobSettingsFragment.class.getName(),
		TrustedCredentialsSettings.class.getName(),