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

Commit eea00372 authored by Charles He's avatar Charles He Committed by android-build-merger
Browse files

VPN settings: add missing string resource 

am: 1b5015ca

Change-Id: I02c4ebe3d03cf4cd10c7d7803532433d519ff4e2
parents 9f7308ba 1b5015ca

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -5656,6 +5656,8 @@ 
    <string name="vpn_always_on_summary">Stay connected to VPN at all times</string>

    <!-- Preference summary for app not supporting always-on VPN [CHAR LIMIT=40] -->

    <string name="vpn_always_on_summary_not_supported">Not supported by this app</string>

    <!-- Preference summary for a VPN app that is set to be always-on. [CHAR LIMIT=40]  -->

    <string name="vpn_always_on_summary_active">Always-on active</string>

    <!-- Preference title for the toggle that controls whether to force all network connections to

        go through VPN. [CHAR LIMIT=40] -->

    <string name="vpn_require_connection">Block connections without VPN</string>

src/com/android/settings/vpn2/ManageablePreference.java

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ public abstract class ManageablePreference extends GearPreference { 
        final String[] states = res.getStringArray(R.array.vpn_states);

        String summary = (mState == STATE_NONE ? "" : states[mState]);

        if (mIsAlwaysOn) {

            final String alwaysOnString = res.getString(R.string.vpn_always_on_active);

            final String alwaysOnString = res.getString(R.string.vpn_always_on_summary_active);

            summary = TextUtils.isEmpty(summary) ? alwaysOnString : res.getString(

                    R.string.join_two_unrelated_items, summary, alwaysOnString);

        }