diff options
| author | Jeff Davidson <jpd@google.com> | 2014-08-21 04:08:55 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-21 04:08:55 +0000 |
| commit | 7f133dce33dd97a7e82dc9d7e161251a8c635155 (patch) | |
| tree | cfc2530726ff27e08b15021d7214ec598e7ee8ac /packages/VpnDialogs/AndroidManifest.xml | |
| parent | 561f7f438352f70fbefb9c7606269162527e7fe5 (diff) | |
| parent | 814c033d38a856068a5f131f2abf13ea73cc500c (diff) | |
| download | frameworks_base-7f133dce33dd97a7e82dc9d7e161251a8c635155.zip frameworks_base-7f133dce33dd97a7e82dc9d7e161251a8c635155.tar.gz frameworks_base-7f133dce33dd97a7e82dc9d7e161251a8c635155.tar.bz2 | |
am 1ff358ad: am d217efb9: am 709941fd: Merge "Less intrusive VPN dialog and other UX tweaks." into lmp-dev
* commit '1ff358ad2a0b2c0702fde65ff68f4656e55c545f':
Less intrusive VPN dialog and other UX tweaks.
Diffstat (limited to 'packages/VpnDialogs/AndroidManifest.xml')
| -rw-r--r-- | packages/VpnDialogs/AndroidManifest.xml | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/packages/VpnDialogs/AndroidManifest.xml b/packages/VpnDialogs/AndroidManifest.xml index 03d920a..1768400 100644 --- a/packages/VpnDialogs/AndroidManifest.xml +++ b/packages/VpnDialogs/AndroidManifest.xml @@ -28,14 +28,5 @@ <category android:name="android.intent.category.DEFAULT"/> </intent-filter> </activity> - - <activity android:name=".ManageDialog" - android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert" - android:noHistory="true"> - <intent-filter> - <action android:name="android.intent.action.MAIN"/> - <category android:name="android.intent.category.DEFAULT"/> - </intent-filter> - </activity> </application> </manifest> |