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

Commit 9bc7f7de authored by Romain Hunault's avatar Romain Hunault 🚴🏻
Browse files

Merge remote-tracking branch 'origin/lineage-16.0' into v1-pie

parents 682778cd 79814197

res/values/cm_strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -399,4 +399,8 @@ 
    <string name="app_notification_sound_timeout_value_5_minutes">5 minutes</string>

    <string name="app_notification_sound_timeout_value_15_minutes">10 minutes</string>

    <string name="app_notification_sound_timeout_value_30_minutes">30 minutes</string>



    <!-- Hotspot lineage extras -->

    <string name="tethering_allow_vpn_upstreams_title">Allow clients to use VPNs</string>

    <string name="tethering_allow_vpn_upstreams_summary">Permit hotspot clients to use this device\u2019s VPN connections for upstream connectivity</string>

</resources>

res/xml/tether_prefs.xml

+6 −0
Original line number Diff line number Diff line
@@ -36,6 +36,12 @@ 
        android:title="@string/bluetooth_tether_checkbox_text"

        android:summary="@string/bluetooth_tethering_subtext" />



    <lineageos.preference.LineageSecureSettingSwitchPreference

        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" />



    <Preference

        android:key="disabled_on_data_saver"

        android:summary="@string/tether_settings_disabled_on_data_saver"