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

am e7565f3c: Add L2TP secret, L2TP/IPSec PSK support. Fix screen orientation.

Browse Source 
Merge commit 'e7565f3c48e6c90e65d9c15e33d20673a187c156'

* commit 'e7565f3c48e6c90e65d9c15e33d20673a187c156':
  Add L2TP secret, L2TP/IPSec PSK support. Fix screen orientation.
This commit is contained in:
Hung-ying Tyan
2009-06-26 01:07:01 -07:00
committed by The Android Open Source Project
parent 620965ccc5 e7565f3c48
commit 776be77313
15 changed files with 660 additions and 369 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/SecuritySettings.java
View File

@@ -28,7 +28,6 @@ import android.content.Intent;
import android.content.pm.PackageManager.NameNotFoundException;
import android.database.Cursor;
import android.location.LocationManager;
import android.net.vpn.VpnManager;
import android.os.Bundle;
import android.preference.CheckBoxPreference;
import android.preference.Preference;
@@ -201,17 +200,6 @@ public class SecuritySettings extends PreferenceActivity implements
showPassword.setPersistent(false);
passwordsCat.addPreference(showPassword);
PreferenceScreen vpnPreferences = getPreferenceManager()
.createPreferenceScreen(this);
vpnPreferences.setTitle(R.string.vpn_settings_title);
vpnPreferences.setSummary(R.string.vpn_settings_summary);
vpnPreferences.setIntent(new VpnManager(this).createSettingsActivityIntent());
PreferenceCategory vpnCat = new PreferenceCategory(this);
vpnCat.setTitle(R.string.vpn_settings_category);
root.addPreference(vpnCat);
vpnCat.addPreference(vpnPreferences);
return root;
}