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

Commit 1b152872 authored by Linda Tseng's avatar Linda Tseng Committed by Android (Google) Code Review
Browse files

Merge "Make the text appearance consistant in add vpn dialog"

parents d34b2a96 e0f24e6f

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

+2 −0
Original line number Diff line number Diff line
@@ -143,6 +143,7 @@ class ConfigDialog extends AlertDialog implements TextWatcher, 
        }

        mMppe.setChecked(mProfile.mppe);

        mL2tpSecret.setText(mProfile.l2tpSecret);

        mL2tpSecret.setTextAppearance(android.R.style.TextAppearance_DeviceDefault_Medium);

        mIpsecIdentifier.setText(mProfile.ipsecIdentifier);

        mIpsecSecret.setText(mProfile.ipsecSecret);

        loadCertificates(mIpsecUserCert, Credentials.USER_PRIVATE_KEY, 0, mProfile.ipsecUserCert);
@@ -152,6 +153,7 @@ class ConfigDialog extends AlertDialog implements TextWatcher, 
                R.string.vpn_no_server_cert, mProfile.ipsecServerCert);

        mSaveLogin.setChecked(mProfile.saveLogin);

        mAlwaysOnVpn.setChecked(mProfile.key.equals(VpnUtils.getLockdownVpn()));

        mPassword.setTextAppearance(android.R.style.TextAppearance_DeviceDefault_Medium);



        // Hide lockdown VPN on devices that require IMS authentication

        if (SystemProperties.getBoolean("persist.radio.imsregrequired", false)) {