Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52df3343 authored by Martijn Coenen's avatar Martijn Coenen Committed by Android (Google) Code Review
Browse files

Merge "HCE: Latest UX and strings." into klp-dev

parents 37922a16 da6c0ba3
Loading
Loading
Loading
Loading
+1 −6
Original line number Diff line number Diff line
@@ -1621,14 +1621,9 @@
                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" />
+9.99 KiB
Loading image diff...
+6.08 KiB
Loading image diff...
+16.4 KiB
Loading image diff...
+24.2 KiB
Loading image diff...
Loading