commit cc0e4db618d9bab9fc759c55ca49913704d2a7f0
author Jean-Baptiste Queru <jbq@google.com> Fri Sep 10 16:22:20 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 10 16:22:20 2010 -0700
tree 3a8b847367b8c6d97953e6db562bebfbdf1499ea
parent 74cb5b80988507fc3d4ca18785e1d43243baa86e
parent 8ce1853fffd8950f7f3588af28d5e064c20cd29f

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

Merge commit '8ce1853fffd8950f7f3588af28d5e064c20cd29f'

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

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 95c65e9..e93cb2e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -196,6 +196,7 @@
         </activity-alias>
 
         <activity android:name=".vpn.VpnSettings"
+                android:label="@string/vpn_settings_title"
                 android:configChanges="orientation|keyboardHidden"
                 android:clearTaskOnLaunch="true">
             <intent-filter>
@@ -203,6 +204,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>