Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add activity action for Configure Wi-Fi settings."

Browse Source
This commit is contained in:
TreeHugger Robot
2017-01-12 23:25:46 +00:00
committed by Android (Google) Code Review
parent 244a63a2d3 30162889e9
commit fac595ae56
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/system-current.txt
View File

@@ -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
core/java/android/provider/Settings.java
View File

@@ -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>