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

Merge "Explicit GridLayout alignment to fix warnings."

Browse Source
This commit is contained in:
Jeff Sharkey
2013-02-21 23:32:23 +00:00
committed by Android (Google) Code Review
parent 2ad5255623 1a55f95d45
commit 340935404a
7 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/vpn2/VpnSettings.java
View File

@@ -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) {