PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update string: lockdown confirmation dialog title"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-02-16 20:58:42 +00:00
committed by Android (Google) Code Review
parent 33c51a7b5b 7f96c4c848
commit be59c35037
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -5411,6 +5411,8 @@
<string name="vpn_not_supported_by_this_app">Not supported by this app</string> <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. --> <!-- Preference title for forcing all network connections to go through VPN. -->
<string name="vpn_require_connection">Only allow connections through VPN</string> <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. --> <!-- 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> <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. --> <!-- 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. -->

3
src/com/android/settings/vpn2/ConfirmLockdownFragment.java
View File

@@ -78,7 +78,8 @@ public class ConfirmLockdownFragment extends InstrumentedDialogFragment
final boolean wasLockdown = getArguments().getBoolean(ARG_LOCKDOWN_SRC); final boolean wasLockdown = getArguments().getBoolean(ARG_LOCKDOWN_SRC);
final boolean nowLockdown = getArguments().getBoolean(ARG_LOCKDOWN_DST); 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 = final int actionId =
(replacing ? R.string.vpn_replace : (replacing ? R.string.vpn_replace :
(nowLockdown ? R.string.vpn_turn_on : R.string.okay)); (nowLockdown ? R.string.vpn_turn_on : R.string.okay));