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

Commit d7216d34 authored by Jason Monk's avatar Jason Monk Committed by android-build-merger
Browse files

Merge "Add action to launch webview implementation settings" into nyc-dev am:... 

Merge "Add action to launch webview implementation settings" into nyc-dev am: c91f5e29 am: eb435a3a
am: ef8fd632

* commit 'ef8fd632':
  Add action to launch webview implementation settings

Change-Id: I7428a61f23573e2ce91d181c7238195f661ca43a
parents bfc000d4 ef8fd632

api/current.txt

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

    field public static final java.lang.String ACTION_VPN_SETTINGS = "android.settings.VPN_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_WIFI_IP_SETTINGS = "android.settings.WIFI_IP_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";

api/system-current.txt

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

    field public static final java.lang.String ACTION_VPN_SETTINGS = "android.settings.VPN_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_WIFI_IP_SETTINGS = "android.settings.WIFI_IP_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";

api/test-current.txt

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

    field public static final java.lang.String ACTION_VPN_SETTINGS = "android.settings.VPN_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_WIFI_IP_SETTINGS = "android.settings.WIFI_IP_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";

core/java/android/provider/Settings.java

+10 −0
Original line number Diff line number Diff line
@@ -1267,6 +1267,16 @@ public final class Settings { 
    public static final String ACTION_VR_LISTENER_SETTINGS

            = "android.settings.VR_LISTENER_SETTINGS";



    /**

     * Activity Action: Allows user to select current webview implementation.

     * <p>

     * Input: Nothing.

     * <p>

     * Output: Nothing.

     */

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

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



    // End of Intent actions for Settings



    /**