diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2013-02-21 09:47:48 -0800 |
|---|---|---|
| committer | Jeff Sharkey <jsharkey@android.com> | 2013-02-21 09:47:48 -0800 |
| commit | 8b78299d94ebb09fb9bf2bc7fb0015d2f1950839 (patch) | |
| tree | c0473bf6f0114cfa508ea949281f42ce9e4de86c /src/com/android/settings/vpn2 | |
| parent | dd395e210aa7fa35935dbd2c416a6d01e971b367 (diff) | |
| download | packages_apps_Settings-8b78299d94ebb09fb9bf2bc7fb0015d2f1950839.zip packages_apps_Settings-8b78299d94ebb09fb9bf2bc7fb0015d2f1950839.tar.gz packages_apps_Settings-8b78299d94ebb09fb9bf2bc7fb0015d2f1950839.tar.bz2 | |
Improve notification UI for lockdown VPN.
Bug: 7064111
Change-Id: I951c1c116d2e0e22d1b32194d38f1431e806cbca
Diffstat (limited to 'src/com/android/settings/vpn2')
| -rw-r--r-- | src/com/android/settings/vpn2/VpnSettings.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/com/android/settings/vpn2/VpnSettings.java b/src/com/android/settings/vpn2/VpnSettings.java index 96ac392..188cd30 100644 --- a/src/com/android/settings/vpn2/VpnSettings.java +++ b/src/com/android/settings/vpn2/VpnSettings.java @@ -66,6 +66,8 @@ public class VpnSettings extends SettingsPreferenceFragment implements private static final String TAG_LOCKDOWN = "lockdown"; + private static final String EXTRA_PICK_LOCKDOWN = "android.net.vpn.PICK_LOCKDOWN"; + // TODO: migrate to using DialogFragment when editing private final IConnectivityManager mService = IConnectivityManager.Stub @@ -89,6 +91,12 @@ public class VpnSettings extends SettingsPreferenceFragment implements setHasOptionsMenu(true); addPreferencesFromResource(R.xml.vpn_settings2); + final boolean pickLockdown = getActivity() + .getIntent().getBooleanExtra(EXTRA_PICK_LOCKDOWN, false); + if (pickLockdown) { + LockdownConfigFragment.show(this); + } + if (savedState != null) { VpnProfile profile = VpnProfile.decode(savedState.getString("VpnKey"), savedState.getByteArray("VpnProfile")); |