diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2012-08-25 00:06:08 -0700 |
|---|---|---|
| committer | Jeff Sharkey <jsharkey@android.com> | 2012-08-26 17:01:46 -0700 |
| commit | 9fd7ac1ec7c0c3984f225a237bd6e3dbafc7f831 (patch) | |
| tree | e61e0abed374c4676caecb819f4d531ad25091ff /src/com/android/settings/Settings.java | |
| parent | 5e61ba5576d912c42af004510484a77625a96d44 (diff) | |
| download | packages_apps_Settings-9fd7ac1ec7c0c3984f225a237bd6e3dbafc7f831.tar.gz packages_apps_Settings-9fd7ac1ec7c0c3984f225a237bd6e3dbafc7f831.tar.bz2 packages_apps_Settings-9fd7ac1ec7c0c3984f225a237bd6e3dbafc7f831.zip | |
Always-on VPN.
Adds support for always-on VPN profiles. Users pick an always-on VPN
from list of existing VPN profiles, which must use an IP address for
both VPN server and DNS. Moved "add" operation into action bar.
Bug: 5756357
Change-Id: I4c7ed7f2a3b027be1baf65c08213336a61f3acfe
Diffstat (limited to 'src/com/android/settings/Settings.java')
| -rw-r--r-- | src/com/android/settings/Settings.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java index f8c23d77a..8e3987ff6 100644 --- a/src/com/android/settings/Settings.java +++ b/src/com/android/settings/Settings.java @@ -24,6 +24,7 @@ import com.android.settings.applications.ManageApplications; import com.android.settings.bluetooth.BluetoothEnabler; import com.android.settings.deviceinfo.Memory; import com.android.settings.fuelgauge.PowerUsageSummary; +import com.android.settings.vpn2.VpnSettings; import com.android.settings.wifi.WifiEnabler; import android.accounts.Account; @@ -361,7 +362,8 @@ public class Settings extends PreferenceActivity WirelessSettings.class.getName().equals(fragmentName) || SoundSettings.class.getName().equals(fragmentName) || PrivacySettings.class.getName().equals(fragmentName) || - ManageAccountsSettings.class.getName().equals(fragmentName)) { + ManageAccountsSettings.class.getName().equals(fragmentName) || + VpnSettings.class.getName().equals(fragmentName)) { intent.putExtra(EXTRA_CLEAR_UI_OPTIONS, true); } |