Merge "Add activity action for Configure Wi-Fi settings." (fac595ae) · Commits · e / os / android_frameworks_base

api/system-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -35931,6 +35931,7 @@ 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_CONFIGURE_WIFI_SETTINGS = "android.settings.CONFIGURE_WIFI_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";
		field public static final java.lang.String ACTION_DEVICE_INFO_SETTINGS = "android.settings.DEVICE_INFO_SETTINGS";

+16 −0

Original line number	Diff line number	Diff line
		@@ -375,6 +375,22 @@ public final class Settings {
		public static final String ACTION_WIFI_IP_SETTINGS =
		"android.settings.WIFI_IP_SETTINGS";

		/**
		* Activity Action: Show settings to allow the configuration of Wi-Fi features.
		* <p>
		* In some cases, a matching Activity may not exist, so ensure you
		* safeguard against this.
		* <p>
		* Input: Nothing.
		* <p>
		* Output: Nothing.
		* @hide
		*/
		@SystemApi
		@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
		public static final String ACTION_CONFIGURE_WIFI_SETTINGS =
		"android.settings.CONFIGURE_WIFI_SETTINGS";

		/**
		* Activity Action: Show settings to allow configuration of Wi-Fi saved networks.
		* <p>