commit 26515da08707b6f8182cc8b0ed5e01e97aa92a96
author Martijn Coenen <maco@google.com> Thu Aug 01 18:13:33 2013 -0700
committer Martijn Coenen <maco@google.com> Tue Aug 06 19:16:54 2013 -0700
tree 5b5e0e2501d106ec438d71bee310bf0a5c140b37
parent 8a181dd0d1e710a2376488b158d71db915f73be6

NFC payment settings.

First version, pending final UX.

Change-Id: I357e900c3f2012b35814ae197c49a8c9b97b7148

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 10c66d4..5769305 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1571,6 +1571,31 @@
                 android:resource="@id/user_settings" />
         </activity>
 
+        <activity android:name="Settings$PaymentSettingsActivity"
+                android:uiOptions="splitActionBarWhenNarrow"
+                android:label="@string/nfc_payment_settings_title"
+                android:taskAffinity=""
+                android:excludeFromRecents="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.settings.NFC_PAYMENT_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.nfc.PaymentSettings" />
+            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+                android:resource="@id/nfc_payment_settings" />
+        </activity>
+        <activity android:name=".nfc.PaymentDefaultDialog"
+                  android:label="@string/nfc_payment_set_default"
+                  android:excludeFromRecents="true"
+                  android:theme="@*android:style/Theme.Holo.Light.Dialog.Alert">
+            <intent-filter>
+                <action android:name="android.nfc.cardemulation.ACTION_CHANGE_DEFAULT" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
         <activity android:name="Settings$NotificationAccessSettingsActivity"
                   android:label="@string/manage_notification_access"
                   android:taskAffinity=""