Merge "Let apps link to noti settings and vice versa." (71b60b86) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -5102,6 +5102,7 @@ package android.app {
		field public static final java.lang.String EXTRA_AUDIO_CONTENTS_URI = "android.audioContents";
		field public static final java.lang.String EXTRA_BACKGROUND_IMAGE_URI = "android.backgroundImageUri";
		field public static final java.lang.String EXTRA_BIG_TEXT = "android.bigText";
		field public static final java.lang.String EXTRA_CHANNEL_ID = "android.intent.extra.CHANNEL_ID";
		field public static final java.lang.String EXTRA_CHRONOMETER_COUNT_DOWN = "android.chronometerCountDown";
		field public static final java.lang.String EXTRA_COLORIZED = "android.colorized";
		field public static final java.lang.String EXTRA_COMPACT_ACTIONS = "android.compactActions";
		@@ -34064,6 +34065,7 @@ package android.provider {
		field public static final java.lang.String ACTION_APPLICATION_DETAILS_SETTINGS = "android.settings.APPLICATION_DETAILS_SETTINGS";
		field public static final java.lang.String ACTION_APPLICATION_DEVELOPMENT_SETTINGS = "android.settings.APPLICATION_DEVELOPMENT_SETTINGS";
		field public static final java.lang.String ACTION_APPLICATION_SETTINGS = "android.settings.APPLICATION_SETTINGS";
		field public static final java.lang.String ACTION_APP_NOTIFICATION_SETTINGS = "android.settings.APP_NOTIFICATION_SETTINGS";
		field public static final java.lang.String ACTION_BATTERY_SAVER_SETTINGS = "android.settings.BATTERY_SAVER_SETTINGS";
		field public static final java.lang.String ACTION_BLUETOOTH_SETTINGS = "android.settings.BLUETOOTH_SETTINGS";
		field public static final java.lang.String ACTION_CAPTIONING_SETTINGS = "android.settings.CAPTIONING_SETTINGS";

api/system-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -5263,6 +5263,7 @@ package android.app {
		field public static final java.lang.String EXTRA_AUDIO_CONTENTS_URI = "android.audioContents";
		field public static final java.lang.String EXTRA_BACKGROUND_IMAGE_URI = "android.backgroundImageUri";
		field public static final java.lang.String EXTRA_BIG_TEXT = "android.bigText";
		field public static final java.lang.String EXTRA_CHANNEL_ID = "android.intent.extra.CHANNEL_ID";
		field public static final java.lang.String EXTRA_CHRONOMETER_COUNT_DOWN = "android.chronometerCountDown";
		field public static final java.lang.String EXTRA_COLORIZED = "android.colorized";
		field public static final java.lang.String EXTRA_COMPACT_ACTIONS = "android.compactActions";

api/test-current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -5112,6 +5112,7 @@ package android.app {
		field public static final java.lang.String EXTRA_AUDIO_CONTENTS_URI = "android.audioContents";
		field public static final java.lang.String EXTRA_BACKGROUND_IMAGE_URI = "android.backgroundImageUri";
		field public static final java.lang.String EXTRA_BIG_TEXT = "android.bigText";
		field public static final java.lang.String EXTRA_CHANNEL_ID = "android.intent.extra.CHANNEL_ID";
		field public static final java.lang.String EXTRA_CHRONOMETER_COUNT_DOWN = "android.chronometerCountDown";
		field public static final java.lang.String EXTRA_COLORIZED = "android.colorized";
		field public static final java.lang.String EXTRA_COMPACT_ACTIONS = "android.compactActions";
		@@ -34182,6 +34183,7 @@ package android.provider {
		field public static final java.lang.String ACTION_APPLICATION_DETAILS_SETTINGS = "android.settings.APPLICATION_DETAILS_SETTINGS";
		field public static final java.lang.String ACTION_APPLICATION_DEVELOPMENT_SETTINGS = "android.settings.APPLICATION_DEVELOPMENT_SETTINGS";
		field public static final java.lang.String ACTION_APPLICATION_SETTINGS = "android.settings.APPLICATION_SETTINGS";
		field public static final java.lang.String ACTION_APP_NOTIFICATION_SETTINGS = "android.settings.APP_NOTIFICATION_SETTINGS";
		field public static final java.lang.String ACTION_BATTERY_SAVER_SETTINGS = "android.settings.BATTERY_SAVER_SETTINGS";
		field public static final java.lang.String ACTION_BLUETOOTH_SETTINGS = "android.settings.BLUETOOTH_SETTINGS";
		field public static final java.lang.String ACTION_CAPTIONING_SETTINGS = "android.settings.CAPTIONING_SETTINGS";

core/java/android/app/Notification.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -109,6 +109,13 @@ public class Notification implements Parcelable
		public static final String INTENT_CATEGORY_NOTIFICATION_PREFERENCES
		= "android.intent.category.NOTIFICATION_PREFERENCES";

		/**
		* Optional extra for {@link #INTENT_CATEGORY_NOTIFICATION_PREFERENCES}. If provided, will
		* contain a {@link NotificationChannel#getId() channel id} that can be used to narrow down
		* what in app notifications settings should be shown.
		*/
		public static final String EXTRA_CHANNEL_ID = "android.intent.extra.CHANNEL_ID";

		/**
		* Use all default values (where applicable).
		*/

core/java/android/provider/Settings.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -1280,9 +1280,7 @@ public final class Settings {
		* Input: Optionally, {@link #EXTRA_CHANNEL_ID}, to highlight that channel.
		* <p>
		* Output: Nothing.
		* @hide
		*/
		@SystemApi
		@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
		public static final String ACTION_APP_NOTIFICATION_SETTINGS
		= "android.settings.APP_NOTIFICATION_SETTINGS";
		@@ -1290,8 +1288,6 @@ public final class Settings {
		/**
		* Activity Action: Show notification settings for a single {@link NotificationChannel}.
		* <p>
		* Must be called from an activity.
		* <p>
		* Input: {@link #EXTRA_APP_PACKAGE}, the package containing the channel to display.
		* Input: {@link #EXTRA_CHANNEL_ID}, the id of the channel to display.
		* <p>