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.
This commit is contained in:
Jean-Baptiste Queru
2010-09-10 15:47:21 -07:00
committed by Android Git Automerger

View File

@@ -188,6 +188,7 @@
</activity> </activity>
<activity android:name=".vpn.VpnSettings" <activity android:name=".vpn.VpnSettings"
android:label="@string/vpn_settings_title"
android:configChanges="orientation|keyboardHidden" android:configChanges="orientation|keyboardHidden"
android:clearTaskOnLaunch="true"> android:clearTaskOnLaunch="true">
<intent-filter> <intent-filter>
@@ -195,6 +196,7 @@
<action android:name="android.net.vpn.SETTINGS" /> <action android:name="android.net.vpn.SETTINGS" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.VOICE_LAUNCH" /> <category android:name="android.intent.category.VOICE_LAUNCH" />
<category android:name="com.android.settings.SHORTCUT" />
</intent-filter> </intent-filter>
</activity> </activity>