Merge "Add manage notifications screen" into pi-dev (2c1de66c) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+17 −0

Original line number	Diff line number	Diff line
		@@ -2661,6 +2661,23 @@
		android:resource="@string/sound_dashboard_summary"/>
		</activity>

		<!-- Show apps for which application-level notification settings are applicable -->
		<activity android:name="Settings$NotificationAppListActivity"
		android:label="@string/app_notifications_title"
		android:icon="@drawable/ic_notifications"
		android:exported="true"
		android:taskAffinity="">
		<intent-filter android:priority="1">
		<action android:name="android.settings.ALL_APPS_NOTIFICATION_SETTINGS" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		<intent-filter android:priority="150">
		<action android:name="com.android.settings.action.SETTINGS" />
		</intent-filter>
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		android:value="com.android.settings.applications.manageapplications.ManageApplications" />
		</activity>

		<!-- Show application-level notification settings (app passed in as extras) -->
		<activity android:name="Settings$AppNotificationSettingsActivity"
		android:exported="true">

res/menu/manage_apps.xml

+8 −0

Original line number	Diff line number	Diff line
		@@ -37,6 +37,14 @@
		android:id="@+id/sort_order_size"
		android:title="@string/sort_order_size"
		android:showAsAction="never" />
		<item
		android:id="@+id/sort_order_recent_notification"
		android:title="@string/sort_order_recent_notification"
		android:showAsAction="never" />
		<item
		android:id="@+id/sort_order_frequent_notification"
		android:title="@string/sort_order_frequent_notification"
		android:showAsAction="never" />
		<item
		android:id="@+id/reset_app_preferences"
		android:title="@string/reset_app_preferences"

res/values/strings.xml

+11 −0

Original line number	Diff line number	Diff line
		@@ -3820,6 +3820,10 @@
		<string name="sort_order_alpha">Sort by name</string>
		<!-- Manage applications screen, menu item. Sorts all of the apps in the list based on their file size. This is used to uninstall when space is getting low. -->
		<string name="sort_order_size">Sort by size</string>
		<!-- Manage applications screen, menu item. Sorts all of the apps in the list based on how recently they sent notifications.-->
		<string name="sort_order_recent_notification">Most recent</string>
		<!-- Manage applications screen, menu item. Sorts all of the apps in the list based on how often they send notifications. -->
		<string name="sort_order_frequent_notification">Most frequent</string>
		<!-- [CHAR LIMIT=25] Manage applications screen, menu item. Show running services. -->
		<string name="show_running_services">Show running services</string>
		<!-- [CHAR LIMIT=25] Manage applications screen, menu item. Show background cached processes. -->
		@@ -7310,6 +7314,13 @@
		<!-- Default Apps > Default notification assistant -->
		<string name="default_notification_assistant">Notification assistant</string>

		<!-- app summary of notification app list screen [CHAR LIMIT=100] -->
		<string name="notifications_sent_daily">~<xliff:g id="number">%1$s</xliff:g> sent daily</string>
		<!-- app summary of notification app list screen [CHAR LIMIT=100] -->
		<string name="notifications_sent_weekly">~<xliff:g id="number">%1$s</xliff:g> sent weekly</string>
		<!-- app summary of notification app list screen [CHAR LIMIT=100] -->
		<string name="notifications_sent_never">Never</string>

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

res/xml/configure_notification_settings.xml

+5 −6

Original line number	Diff line number	Diff line
		@@ -69,14 +69,13 @@

		<!-- See all apps button -->
		<Preference
		android:title="@string/notifications_title"
		android:key="all_notifications"
		android:title="@string/notifications_title"
		android:fragment="com.android.settings.applications.manageapplications.ManageApplications"
		android:order="22">
		<intent
		android:action="android.intent.action.MAIN"
		android:targetPackage="com.android.settings"
		android:targetClass="com.android.settings.Settings$ManageApplicationsActivity">
		</intent>
		<extra
		android:name="classname"
		android:value="com.android.settings.Settings$NotificationAppListActivity" />
		</Preference>
		</PreferenceCategory>

src/com/android/settings/Settings.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -106,6 +106,7 @@ public class Settings extends SettingsActivity {
		public static class ZenModeEventRuleSettingsActivity extends SettingsActivity { /* empty */ }
		public static class SoundSettingsActivity extends SettingsActivity { /* empty */ }
		public static class ConfigureNotificationSettingsActivity extends SettingsActivity { /* empty */ }
		public static class NotificationAppListActivity extends SettingsActivity { /* empty */ }
		public static class AppNotificationSettingsActivity extends SettingsActivity { /* empty */ }
		public static class ChannelNotificationSettingsActivity extends SettingsActivity { /* empty */ }
		public static class ChannelGroupNotificationSettingsActivity extends SettingsActivity { /* empty */ }