diff --git a/res/values/strings.xml b/res/values/strings.xml index faa0c1ca170..64507e75605 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -5588,29 +5588,25 @@ How it works - Use Tap & pay to make in-store purchases + Pay with your phone in stores Payment default Not set %1$s - %2$s - - If open app supports Tap & pay + + Use default + + Always - Use that app instead of %1$s - - Use that app instead - - Still use %1$s - - Still use default + Except when another payment app is open At a Tap & pay terminal, pay with: Paying at the terminal - Once you\u2019ve set up a Tap & pay app and your phone is powered on, tap your phone on any terminal with the Tap & pay logo on it to make a purchase. + Set up a payment app. Then just hold the back of your phone up to any terminal with the contactless symbol. Got it diff --git a/src/com/android/settings/nfc/NfcForegroundPreference.java b/src/com/android/settings/nfc/NfcForegroundPreference.java index 4f4398f3f18..8ee5535aedd 100644 --- a/src/com/android/settings/nfc/NfcForegroundPreference.java +++ b/src/com/android/settings/nfc/NfcForegroundPreference.java @@ -40,19 +40,12 @@ public class NfcForegroundPreference extends DropDownPreference implements PaymentBackend.PaymentAppInfo defaultApp = mPaymentBackend.getDefaultApp(); boolean foregroundMode = mPaymentBackend.isForegroundMode(); setPersistent(false); - setTitle(getContext().getString(R.string.nfc_payment_open_app)); + setTitle(getContext().getString(R.string.nfc_payment_use_default)); CharSequence favorOpen; CharSequence favorDefault; clearItems(); - if (defaultApp == null) { - favorOpen = getContext().getString(R.string.nfc_payment_favor_open_default_unknown); - favorDefault = getContext().getString(R.string.nfc_payment_favor_default_default_unknown); - } else { - favorOpen = getContext().getString(R.string.nfc_payment_favor_open, defaultApp.label); - favorDefault = getContext().getString(R.string.nfc_payment_favor_default, defaultApp.label); - } - addItem(favorOpen.toString(), true); - addItem(favorDefault.toString(), false); + addItem(getContext().getString(R.string.nfc_payment_favor_open), true); + addItem(getContext().getString(R.string.nfc_payment_favor_default), false); if (foregroundMode) { setSelectedValue(true); } else {