diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-09-10 14:27:49 -0700 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2010-09-10 14:27:49 -0700 |
| commit | 16502e9479f96e3fc484192e0cd4c852c4fc8ea6 (patch) | |
| tree | ad274cb4c53fc684f405a4d35963d01f7649fa8d | |
| parent | 33319b1228d8af25797e1371b088fc8491349c21 (diff) | |
| parent | f7ed857fc448b39b6a5d06e644d0996cfcdcabc4 (diff) | |
| download | Settings-tools_r7.tar.gz | |
Merge "Allow users to create shortcuts to the VPN settings on the Home Screen."android-adt-0.9.9tools_r7
| -rw-r--r-- | AndroidManifest.xml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 78c0f5b3540..1f9ebe41064 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -188,6 +188,7 @@ </activity> <activity android:name=".vpn.VpnSettings" + android:label="@string/vpn_settings_title" android:configChanges="orientation|keyboardHidden" android:clearTaskOnLaunch="true"> <intent-filter> @@ -195,6 +196,7 @@ <action android:name="android.net.vpn.SETTINGS" /> <category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.VOICE_LAUNCH" /> + <category android:name="com.android.settings.SHORTCUT" /> </intent-filter> </activity> |