diff options
| author | Martijn Coenen <maco@google.com> | 2013-08-28 21:26:21 -0700 |
|---|---|---|
| committer | Martijn Coenen <maco@google.com> | 2013-08-29 11:05:57 -0700 |
| commit | 451ba48faa87d78bfbec0597ff06af1747cf6acb (patch) | |
| tree | e8fef45f995228d9a756cd58504f02677ded7085 /AndroidManifest.xml | |
| parent | c4e4277a71c70e96198cb760676ad3b40f9e0e3d (diff) | |
| download | android_packages_apps_Nfc-451ba48faa87d78bfbec0597ff06af1747cf6acb.tar.gz android_packages_apps_Nfc-451ba48faa87d78bfbec0597ff06af1747cf6acb.tar.bz2 android_packages_apps_Nfc-451ba48faa87d78bfbec0597ff06af1747cf6acb.zip | |
HCE: API updates, default handling, lock-screen.
- Use new selection mode APIs
- Fixed up default handling
- Check if service requires device unlock before dispatching
- Fixed isDefaultServiceForAid()
- Fixed a bug where we created two routing managers
Change-Id: Iba4a3ce7f599974ccedbf8d301cc46ff1e99c94e
Diffstat (limited to 'AndroidManifest.xml')
| -rwxr-xr-x | AndroidManifest.xml | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index aaeed4f9..0558d29f 100755 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -58,7 +58,6 @@ /> <activity android:name=".cardemulation.AppChooserActivity" - android:theme="@*android:style/Theme.Holo.Dialog.Alert" android:finishOnCloseSystemDialogs="true" android:excludeFromRecents="true" android:clearTaskOnLaunch="true" @@ -74,7 +73,6 @@ /> <activity android:name=".cardemulation.TapAgainDialog" - android:theme="@*android:style/Theme.Holo.Dialog.Alert" android:finishOnCloseSystemDialogs="true" android:excludeFromRecents="true" android:clearTaskOnLaunch="true" |