From ef5e90c542a7cffcaabfbe76ffc3a6826587ede8 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 | 6 +++ res/xml/vpn_app_management.xml | 6 +++ .../settings/vpn2/AppManagementFragment.java | 48 ++++++++++++++++++- 3 files changed, 59 insertions(+), 1 deletion(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index ef93ba71132..a83c8de557e 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -13017,4 +13017,10 @@ Show pointer while hovering + + + 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 dffbbbe3116..93df378fd76 100644 --- a/res/xml/vpn_app_management.xml +++ b/res/xml/vpn_app_management.xml @@ -23,6 +23,12 @@ android:key="version" android:selectable="false"/> + +