commit da6c0ba382c1c2c9b98f11a1ef9e572472654e27
author Martijn Coenen <maco@google.com> Thu Sep 05 21:07:23 2013 -0700
committer Martijn Coenen <maco@google.com> Wed Sep 11 12:30:46 2013 +0200
tree 8a0b9bc550d79acf8981d86b27888eb1667d6e7e
parent e9aa0a94d0572101dd580bcc48e23b96e6c6cb71

HCE: Latest UX and strings.

Bug: 10262585
Change-Id: I5473c4d387fed884faf77c7448fab1332f710557

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 493d7f4..c2afb23 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1621,15 +1621,10 @@
                 android:resource="@id/nfc_payment_settings" />
         </activity>
         <activity android:name=".nfc.PaymentDefaultDialog"
-                  android:label="@string/nfc_payment_set_default"
+                  android:label="@string/nfc_payment_set_default_label"
                   android:excludeFromRecents="true"
                   android:theme="@*android:style/Theme.Holo.Light.Dialog.Alert">
             <intent-filter>
-                <!-- TODO this filter can be removed -->
-                <action android:name="android.nfc.cardemulation.ACTION_CHANGE_DEFAULT" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-            <intent-filter>
                 <action android:name="android.nfc.cardemulation.action.ACTION_CHANGE_DEFAULT" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>