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.
This commit is contained in:
committed by
Android Git Automerger
commit
cc0e4db618
@@ -196,6 +196,7 @@
|
|||||||
</activity-alias>
|
</activity-alias>
|
||||||
|
|
||||||
<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>
|
||||||
@@ -203,6 +204,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>
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user