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

Commit 9148d2f7 authored by Robin Lee's avatar Robin Lee Committed by android-build-merger
Browse files

Merge "Declare provider.Settings intent for VPN fragment" into nyc-dev 

am: 363e70dd

* commit '363e70dd':
  Declare provider.Settings intent for VPN fragment
parents 248b40bf 363e70dd

api/current.txt

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

    field public static final java.lang.String ACTION_VOICE_CONTROL_DO_NOT_DISTURB_MODE = "android.settings.VOICE_CONTROL_DO_NOT_DISTURB_MODE";

    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_WIFI_IP_SETTINGS = "android.settings.WIFI_IP_SETTINGS";

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

api/system-current.txt

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

    field public static final java.lang.String ACTION_VOICE_CONTROL_DO_NOT_DISTURB_MODE = "android.settings.VOICE_CONTROL_DO_NOT_DISTURB_MODE";

    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_WIFI_IP_SETTINGS = "android.settings.WIFI_IP_SETTINGS";

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

api/test-current.txt

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

    field public static final java.lang.String ACTION_VOICE_CONTROL_DO_NOT_DISTURB_MODE = "android.settings.VOICE_CONTROL_DO_NOT_DISTURB_MODE";

    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_WIFI_IP_SETTINGS = "android.settings.WIFI_IP_SETTINGS";

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

core/java/android/provider/Settings.java

+14 −0
Original line number Diff line number Diff line
@@ -321,6 +321,20 @@ public final class Settings { 
    public static final String ACTION_PRIVACY_SETTINGS =

            "android.settings.PRIVACY_SETTINGS";



    /**

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

     * <p>

     * In some cases, a matching Activity may not exist, so ensure you

     * safeguard against this.

     * <p>

     * Input: Nothing.

     * <p>

     * Output: Nothing.

     */

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    public static final String ACTION_VPN_SETTINGS =

            "android.settings.VPN_SETTINGS";



    /**

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

     * <p>

packages/SystemUI/src/com/android/systemui/qs/QSFooter.java

+2 −2
Original line number Diff line number Diff line
@@ -36,12 +36,12 @@ import com.android.systemui.statusbar.phone.QSTileHost; 
import com.android.systemui.statusbar.phone.SystemUIDialog;

import com.android.systemui.statusbar.policy.SecurityController;



import static android.provider.Settings.ACTION_VPN_SETTINGS;



public class QSFooter implements OnClickListener, DialogInterface.OnClickListener {

    protected static final String TAG = "QSFooter";

    protected static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);



    private static final String ACTION_VPN_SETTINGS = "android.net.vpn.SETTINGS";



    private final View mRootView;

    private final TextView mFooterText;

    private final ImageView mFooterIcon;