From 16c9311e41992ddd8d0bfb5a340cedbf001e3413 Mon Sep 17 00:00:00 2001 From: Oliver Scott Date: Thu, 8 Jul 2021 10:40:49 -0400 Subject: [PATCH] Global VPN feature [2/2] * Create a global VPN toggle for VPNs in the system user. It is only enabled when no VPN is active in any user. Change-Id: Ic3b79beb635afe03642fce9473bc481239166566 Signed-off-by: Mohammad Hasan Keramat J --- res/values/strings.xml | 5 ++ res/xml/vpn_app_management.xml | 6 +++ .../settings/vpn2/AppManagementFragment.java | 48 ++++++++++++++++++- 3 files changed, 58 insertions(+), 1 deletion(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 28b35b3fcf..29ca3882e9 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -14457,4 +14457,9 @@ QR code isn\u0027t a valid format + + Global VPN + Force all traffic on the device through this VPN, including work profile and other users. + Force all traffic on the device through this VPN, including work profile and other users. Note: When enabled, you will not be able to use a separate VPN in a work profile or other users + You need to disable all active VPN connections first to enable this diff --git a/res/xml/vpn_app_management.xml b/res/xml/vpn_app_management.xml index adc441d846..e00f23ccfa 100644 --- a/res/xml/vpn_app_management.xml +++ b/res/xml/vpn_app_management.xml @@ -31,6 +31,12 @@ android:selectable="false"/> --> + +