summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorMartijn Coenen <maco@google.com>2012-05-09 10:48:40 -0700
committerMartijn Coenen <maco@google.com>2012-05-10 15:35:33 -0700
commit78705adb33530d58f6b25bd3976ef36df196af55 (patch)
treed76f02ef122b888269a951b4110eaf9b9c85ed81 /AndroidManifest.xml
parentd82d9db81f30ccecd29a0531e6db9b49c9c2cd95 (diff)
downloadpackages_apps_nfc-78705adb33530d58f6b25bd3976ef36df196af55.zip
packages_apps_nfc-78705adb33530d58f6b25bd3976ef36df196af55.tar.gz
packages_apps_nfc-78705adb33530d58f6b25bd3976ef36df196af55.tar.bz2
UI confirmation for pairing a BT device through NFC.
If we find a BT device to pair through NFC and we haven't seen it device before, request confirmation before pairing it. Bug: 6092058 Change-Id: I34fc638fbdb152a48e90644f9a34cc1a0b942de2
Diffstat (limited to 'AndroidManifest.xml')
-rwxr-xr-xAndroidManifest.xml7
1 files changed, 7 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c200e2c..3d65a2a 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -42,5 +42,12 @@
android:excludeFromRecents="true"
android:noHistory="true"
/>
+ <activity android:name=".handover.ConfirmConnectActivity"
+ android:finishOnCloseSystemDialogs="true"
+ android:excludeFromRecents="true"
+ android:theme="@android:style/Theme.Translucent.NoTitleBar"
+ android:noHistory="true"
+
+ />
</application>
</manifest>