diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2009-06-10 22:52:44 +0800 |
|---|---|---|
| committer | Hung-ying Tyan <tyanh@google.com> | 2009-06-12 15:44:49 +0800 |
| commit | 1617706d2529b2182d1a7fe2348495fb8f40bb81 (patch) | |
| tree | 0054cdb730320cf5e515ab3f068e0ed9d41d9684 /AndroidManifest.xml | |
| parent | 1d09759798f029d684a636683ab7bf185eda9e6f (diff) | |
| download | packages_apps_settings-1617706d2529b2182d1a7fe2348495fb8f40bb81.zip packages_apps_settings-1617706d2529b2182d1a7fe2348495fb8f40bb81.tar.gz packages_apps_settings-1617706d2529b2182d1a7fe2348495fb8f40bb81.tar.bz2 | |
Add VPN settings classes to Settings app.
PATCH SET 2:
+ Add import com.android.settings.R
PATCH SET 3:
+ Remove @Override interface methods to be compilable by Java 1.5.
PATCH SET 4:
+ Add import android.net.vpn.VpnManager
PATCH SET 5:
+ Add license headers.
PATCH SET 6:
+ Remove Constant.java and move the constants to VpnSettings.
+ Make AuthenticationActor implement DialogInterface's handlers.
+ Remove trailing spaces.
PATCH SET 7:
+ Remove default username.
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index f9758f3..2714457 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -110,6 +110,20 @@ </intent-filter> </activity> + <activity android:name=".vpn.VpnSettings" + android:launchMode="singleTask"> + <intent-filter> + <action android:name="android.intent.action.MAIN" /> + <action android:name="android.net.vpn.SETTINGS" /> + <action android:name="android.net.vpn.INSTALL_PROFILE" /> + <category android:name="android.intent.category.LAUNCHER" /> + <category android:name="android.intent.category.DEFAULT" /> + </intent-filter> + </activity> + + <activity android:name=".vpn.VpnTypeSelection"></activity> + <activity android:name=".vpn.VpnEditor"></activity> + <activity android:name="DateTimeSettings" android:label="@string/date_and_time" > <intent-filter> |