Merge "Remove settings intent" (0d1e3990) · Commits · e / os / android_frameworks_base

api/current.txt

+0 −2

Original line number	Diff line number	Diff line
		@@ -35863,7 +35863,6 @@ package android.provider {
		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";
		field public static final java.lang.String ACTION_CAST_SETTINGS = "android.settings.CAST_SETTINGS";
		field public static final java.lang.String ACTION_CHANNEL_GROUP_NOTIFICATION_SETTINGS = "android.settings.CHANNEL_GROUP_NOTIFICATION_SETTINGS";
		field public static final java.lang.String ACTION_CHANNEL_NOTIFICATION_SETTINGS = "android.settings.CHANNEL_NOTIFICATION_SETTINGS";
		field public static final java.lang.String ACTION_DATA_ROAMING_SETTINGS = "android.settings.DATA_ROAMING_SETTINGS";
		field public static final java.lang.String ACTION_DATE_SETTINGS = "android.settings.DATE_SETTINGS";
		@@ -35924,7 +35923,6 @@ package android.provider {
		field public static final java.lang.String EXTRA_APP_PACKAGE = "android.provider.extra.APP_PACKAGE";
		field public static final java.lang.String EXTRA_AUTHORITIES = "authorities";
		field public static final java.lang.String EXTRA_BATTERY_SAVER_MODE_ENABLED = "android.settings.extra.battery_saver_mode_enabled";
		field public static final java.lang.String EXTRA_CHANNEL_GROUP_ID = "android.provider.extra.CHANNEL_GROUP_ID";
		field public static final java.lang.String EXTRA_CHANNEL_ID = "android.provider.extra.CHANNEL_ID";
		field public static final java.lang.String EXTRA_DO_NOT_DISTURB_MODE_ENABLED = "android.settings.extra.do_not_disturb_mode_enabled";
		field public static final java.lang.String EXTRA_DO_NOT_DISTURB_MODE_MINUTES = "android.settings.extra.do_not_disturb_mode_minutes";

core/java/android/provider/Settings.java

+0 −23

Original line number	Diff line number	Diff line
		@@ -41,7 +41,6 @@ import android.app.ActivityThread;
		import android.app.AppOpsManager;
		import android.app.Application;
		import android.app.NotificationChannel;
		import android.app.NotificationChannelGroup;
		import android.app.NotificationManager;
		import android.app.SearchManager;
		import android.app.WallpaperManager;
		@@ -75,7 +74,6 @@ import android.os.RemoteException;
		import android.os.ResultReceiver;
		import android.os.ServiceManager;
		import android.os.UserHandle;
		import android.provider.SettingsValidators;
		import android.provider.SettingsValidators.Validator;
		import android.speech.tts.TextToSpeech;
		import android.telephony.SubscriptionManager;
		@@ -1344,18 +1342,6 @@ public final class Settings {
		public static final String ACTION_CHANNEL_NOTIFICATION_SETTINGS
		= "android.settings.CHANNEL_NOTIFICATION_SETTINGS";

		/**
		* Activity Action: Show notification settings for a single {@link NotificationChannelGroup}.
		* <p>
		* Input: {@link #EXTRA_APP_PACKAGE}, the package containing the channel group to display.
		* Input: {@link #EXTRA_CHANNEL_GROUP_ID}, the id of the channel group to display.
		* <p>
		* Output: Nothing.
		*/
		@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
		public static final String ACTION_CHANNEL_GROUP_NOTIFICATION_SETTINGS =
		"android.settings.CHANNEL_GROUP_NOTIFICATION_SETTINGS";

		/**
		* Activity Extra: The package owner of the notification channel settings to display.
		* <p>
		@@ -1371,15 +1357,6 @@ public final class Settings {
		*/
		public static final String EXTRA_CHANNEL_ID = "android.provider.extra.CHANNEL_ID";

		/**
		* Activity Extra: The {@link NotificationChannelGroup#getId()} of the notification channel
		* group settings to display.
		* <p>
		* This must be passed as an extra field to the
		* {@link #ACTION_CHANNEL_GROUP_NOTIFICATION_SETTINGS}.
		*/
		public static final String EXTRA_CHANNEL_GROUP_ID = "android.provider.extra.CHANNEL_GROUP_ID";

		/**
		* Activity Action: Show notification redaction settings.
		*