Merge "Update string: lockdown confirmation dialog title"

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

    <!-- Preference title for forcing all network connections to go through VPN. -->

    <string name="vpn_require_connection">Only allow connections through VPN</string>

    <!-- Dialog message title to confirm forcing all network connections to go through VPN. [CHAR LIMIT=40] -->

    <string name="vpn_require_connection_title">Require VPN connection?</string>

    <!-- Preference summary when the preference to force all network connections to go through a VPN is enabled, blocking all other network traffic. In this case apps must use the VPN for all connections. -->

    <string name="vpn_lockdown_active">Lockdown active</string>

    <!-- Preference summary when the preference to force all network connections to go through a VPN is disabled. In this case use of the VPN is optional for apps. -->

        final boolean wasLockdown = getArguments().getBoolean(ARG_LOCKDOWN_SRC);

        final boolean nowLockdown = getArguments().getBoolean(ARG_LOCKDOWN_DST);

        final int titleId = replacing ? R.string.vpn_replace_vpn_title : R.string.vpn_set_vpn_title;

        final int titleId = (nowLockdown ? R.string.vpn_require_connection_title :

                (replacing ? R.string.vpn_replace_vpn_title : R.string.vpn_set_vpn_title));

        final int actionId =

                (replacing ? R.string.vpn_replace :

                (nowLockdown ? R.string.vpn_turn_on : R.string.okay));