diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2013-02-21 15:31:09 -0800 |
|---|---|---|
| committer | Jeff Sharkey <jsharkey@android.com> | 2013-02-21 15:31:09 -0800 |
| commit | 1a55f95d45d2be39f3206cf1a4c3a1affd98cd92 (patch) | |
| tree | adc18faae164397a3ffcc2c5914906fa6f2f696e /src/com/android/settings/vpn2 | |
| parent | 8b78299d94ebb09fb9bf2bc7fb0015d2f1950839 (diff) | |
| download | packages_apps_Settings-1a55f95d45d2be39f3206cf1a4c3a1affd98cd92.zip packages_apps_Settings-1a55f95d45d2be39f3206cf1a4c3a1affd98cd92.tar.gz packages_apps_Settings-1a55f95d45d2be39f3206cf1a4c3a1affd98cd92.tar.bz2 | |
Explicit GridLayout alignment to fix warnings.
Also show lockdown VPN dialog whenever relaunched.
Change-Id: Ib8aecbd4a7f9d61906f65fee39f1e819c79aabb4
Diffstat (limited to 'src/com/android/settings/vpn2')
| -rw-r--r-- | src/com/android/settings/vpn2/VpnSettings.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/com/android/settings/vpn2/VpnSettings.java b/src/com/android/settings/vpn2/VpnSettings.java index 188cd30..1f87b14 100644 --- a/src/com/android/settings/vpn2/VpnSettings.java +++ b/src/com/android/settings/vpn2/VpnSettings.java @@ -91,12 +91,6 @@ 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")); @@ -162,6 +156,12 @@ public class VpnSettings extends SettingsPreferenceFragment implements public void onResume() { super.onResume(); + final boolean pickLockdown = getActivity() + .getIntent().getBooleanExtra(EXTRA_PICK_LOCKDOWN, false); + if (pickLockdown) { + LockdownConfigFragment.show(this); + } + // Check KeyStore here, so others do not need to deal with it. if (!mKeyStore.isUnlocked()) { if (!mUnlocking) { |