commit 8ce1853fffd8950f7f3588af28d5e064c20cd29f
author Jean-Baptiste Queru <jbq@google.com> Fri Sep 10 15:47:21 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 10 15:47:21 2010 -0700
tree cb5c3eb1608c9c46a93cf272a0a339172aa66289
parent 40230c1490712b52416e67d0256881db4decb4ef
parent 16502e9479f96e3fc484192e0cd4c852c4fc8ea6

am 16502e94: Merge "Allow users to create shortcuts to the VPN settings on the Home Screen."

Merge commit '16502e9479f96e3fc484192e0cd4c852c4fc8ea6' into gingerbread-plus-aosp

* commit '16502e9479f96e3fc484192e0cd4c852c4fc8ea6':
  Allow users to create shortcuts to the VPN settings on the Home Screen.

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 1dacea4..1c1bb6d 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>