Merge "Update string: lockdown confirmation dialog title"

This commit is contained in:
TreeHugger Robot
2017-02-16 20:58:42 +00:00
committed by Android (Google) Code Review
2 changed files with 4 additions and 1 deletions

View File

@@ -78,7 +78,8 @@ public class ConfirmLockdownFragment extends InstrumentedDialogFragment
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));