commit fd2b6293358bda6f6beaab088e8913a13c0e2e31
author Andres Morales <anmorales@google.com> Mon Nov 25 17:26:13 2013 -0800
committer Andres Morales <anmorales@google.com> Fri Dec 06 13:50:26 2013 -0800
tree fdfbdc41870c66b6080ec468aeebed53e917f5eb
parent aadd6e516a84b5ea65ffbf659efde6166ef8fcd5

Settings for NFC Unlock

Change-Id: Ifaa2717da6c364daa7af073e42fc8f6a097c14bb

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 567400b..b68fca0 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1716,6 +1716,16 @@
             </intent-filter>
         </activity>
 
+       <activity android:name=".PairNfcDevice"
+                android:taskAffinity="com.android.settings"
+                android:parentActivityName="Settings$SecuritySettingsActivity"
+                android:launchMode="singleTask">
+            <intent-filter>
+                <action android:name="android.settings.PAIR_NFC_DEVICE" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
         <activity android:name="Settings$NotificationAccessSettingsActivity"
                   android:label="@string/manage_notification_access"
                   android:taskAffinity=""