Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fdd3cb50 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add ACTION_WIFI_SAVED_NETWORK_SETTINGS to Settings."

parents 23c25e7a 28d89393

api/system-current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -35380,6 +35380,7 @@ package android.provider { 
    field public static final java.lang.String ACTION_VR_LISTENER_SETTINGS = "android.settings.VR_LISTENER_SETTINGS";

    field public static final java.lang.String ACTION_VR_LISTENER_SETTINGS = "android.settings.VR_LISTENER_SETTINGS";

    field public static final java.lang.String ACTION_WEBVIEW_SETTINGS = "android.settings.WEBVIEW_SETTINGS";

    field public static final java.lang.String ACTION_WEBVIEW_SETTINGS = "android.settings.WEBVIEW_SETTINGS";

    field public static final java.lang.String ACTION_WIFI_IP_SETTINGS = "android.settings.WIFI_IP_SETTINGS";

    field public static final java.lang.String ACTION_WIFI_IP_SETTINGS = "android.settings.WIFI_IP_SETTINGS";

    field public static final java.lang.String ACTION_WIFI_SAVED_NETWORK_SETTINGS = "android.settings.WIFI_SAVED_NETWORK_SETTINGS";

    field public static final java.lang.String ACTION_WIFI_SETTINGS = "android.settings.WIFI_SETTINGS";

    field public static final java.lang.String ACTION_WIFI_SETTINGS = "android.settings.WIFI_SETTINGS";

    field public static final java.lang.String ACTION_WIRELESS_SETTINGS = "android.settings.WIRELESS_SETTINGS";

    field public static final java.lang.String ACTION_WIRELESS_SETTINGS = "android.settings.WIRELESS_SETTINGS";

    field public static final java.lang.String AUTHORITY = "settings";

    field public static final java.lang.String AUTHORITY = "settings";

core/java/android/provider/Settings.java

+16 −0
Original line number Original line Diff line number Diff line
@@ -368,6 +368,22 @@ public final class Settings { 
    public static final String ACTION_WIFI_IP_SETTINGS =

    public static final String ACTION_WIFI_IP_SETTINGS =

            "android.settings.WIFI_IP_SETTINGS";

            "android.settings.WIFI_IP_SETTINGS";





    /**

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

     * <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_WIFI_SAVED_NETWORK_SETTINGS =

            "android.settings.WIFI_SAVED_NETWORK_SETTINGS";



    /**

    /**

     * Activity Action: Show settings to allow configuration of Bluetooth.

     * Activity Action: Show settings to allow configuration of Bluetooth.

     * <p>

     * <p>

core/tests/coretests/src/android/provider/SettingsProviderTest.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -349,6 +349,7 @@ public class SettingsProviderTest extends AndroidTestCase { 
        assertCanBeHandled(new Intent(Settings.ACTION_USER_DICTIONARY_SETTINGS));

        assertCanBeHandled(new Intent(Settings.ACTION_USER_DICTIONARY_SETTINGS));

        assertCanBeHandled(new Intent(Settings.ACTION_WIFI_IP_SETTINGS));

        assertCanBeHandled(new Intent(Settings.ACTION_WIFI_IP_SETTINGS));

        assertCanBeHandled(new Intent(Settings.ACTION_WIFI_SETTINGS));

        assertCanBeHandled(new Intent(Settings.ACTION_WIFI_SETTINGS));

        assertCanBeHandled(new Intent(Settings.ACTION_WIFI_SAVED_NETWORK_SETTINGS));

        assertCanBeHandled(new Intent(Settings.ACTION_WIRELESS_SETTINGS));

        assertCanBeHandled(new Intent(Settings.ACTION_WIRELESS_SETTINGS));

    }

    }