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

Improve notification UI for lockdown VPN.

Browse Source 
Bug: 7064111
Change-Id: I951c1c116d2e0e22d1b32194d38f1431e806cbca
This commit is contained in:
Jeff Sharkey
2013-02-21 09:47:48 -08:00
parent dd395e210a
commit 8b78299d94
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,6 +66,8 @@ public class VpnSettings extends SettingsPreferenceFragment implements
private static final String TAG_LOCKDOWN = "lockdown"; 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 // TODO: migrate to using DialogFragment when editing
private final IConnectivityManager mService = IConnectivityManager.Stub private final IConnectivityManager mService = IConnectivityManager.Stub
@@ -89,6 +91,12 @@ public class VpnSettings extends SettingsPreferenceFragment implements
setHasOptionsMenu(true); setHasOptionsMenu(true);
addPreferencesFromResource(R.xml.vpn_settings2); addPreferencesFromResource(R.xml.vpn_settings2);
final boolean pickLockdown = getActivity()
.getIntent().getBooleanExtra(EXTRA_PICK_LOCKDOWN, false);
if (pickLockdown) {
LockdownConfigFragment.show(this);
}
if (savedState != null) { if (savedState != null) {
VpnProfile profile = VpnProfile.decode(savedState.getString("VpnKey"), VpnProfile profile = VpnProfile.decode(savedState.getString("VpnKey"),
savedState.getByteArray("VpnProfile")); savedState.getByteArray("VpnProfile"));