From 49fbdbe0553e3facd3255e375962120ff2a5ce3f Mon Sep 17 00:00:00 2001
From: Sam Mortimer <sam@mortimer.me.uk>
Date: Thu, 15 Aug 2019 15:10:29 -0700
Subject: [PATCH] Settings: Add hotspot setting to allow VPN upstreams

Co-Authored-By: Sage Cheng <sagecheng@calyxinstitute.org>
Change-Id: I34924fe8e60e3d492f219aa6d0ffa54f0bd46e38
---
 res/values/cm_strings.xml | 4 ++++
 res/xml/tether_prefs.xml  | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index b525be0b266..4059f1d7d35 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -40,6 +40,10 @@
     <string name="status_bar_double_tap_to_sleep_title">Tap to sleep</string>
     <string name="status_bar_double_tap_to_sleep_summary">Double-tap on the status bar or lockscreen to turn off the display</string>
 
+    <!-- Hotspot extras -->
+    <string name="tethering_allow_vpn_upstreams_title">Use VPN for connected devices</string>
+    <string name="tethering_allow_vpn_upstreams_summary">When this device is using a VPN, all devices connected to the hotspot will use the same VPN</string>
+
     <!-- Lock screen pattern size -->
     <string name="lock_pattern_size_3" translatable="false">3 \u00d7 3</string>
     <string name="lock_pattern_size_4" translatable="false">4 \u00d7 4</string>
diff --git a/res/xml/tether_prefs.xml b/res/xml/tether_prefs.xml
index c3ea3cbcd8b..209a1cedbaf 100644
--- a/res/xml/tether_prefs.xml
+++ b/res/xml/tether_prefs.xml
@@ -48,6 +48,12 @@
         android:summary="@string/ethernet_tethering_subtext"
         settings:keywords="@string/keywords_hotspot_tethering" />
 
+    <lineageos.preference.SecureSettingSwitchPreference
+        android:key="tethering_allow_vpn_upstreams"
+        android:title="@string/tethering_allow_vpn_upstreams_title"
+        android:summary="@string/tethering_allow_vpn_upstreams_summary"
+        android:defaultValue="false" />
+
     <com.android.settingslib.widget.FooterPreference
         android:key="disabled_on_data_saver"
         android:title="@string/tether_settings_disabled_on_data_saver"