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

Merge "Legacy VPN Configuration Dialog includes error message if VPN is an insecure type." into sc-dev

Browse Source
This commit is contained in:
Jeremy Goldman
2021-03-24 01:00:17 +00:00
committed by Android (Google) Code Review
parent cafc769a51 222dd91102
commit 37a7b7df48
3 changed files with 232 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/vpn2/ConfigDialog.java
View File

@@ -204,10 +204,16 @@ class ConfigDialog extends AlertDialog implements TextWatcher,
configureAdvancedOptionsVisibility();
// Create a button to forget the profile if it has already been saved..
if (mExists) {
// Create a button to forget the profile if it has already been saved..
setButton(DialogInterface.BUTTON_NEUTRAL,
context.getString(R.string.vpn_forget), mListener);
// Display warning subtitle if the existing VPN is an insecure type...
if (VpnProfile.isLegacyType(mProfile.type)) {
TextView subtitle = mView.findViewById(R.id.dialog_alert_subtitle);
subtitle.setVisibility(View.VISIBLE);
}
}
// Create a button to save the profile.