diff options
| author | Martijn Coenen <maco@google.com> | 2015-07-29 07:54:04 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-29 07:54:04 +0000 |
| commit | 8e7b9cf9f67344192de98c951c11f144d1cdcd13 (patch) | |
| tree | c979414ef4e27467b6db8323d67611f91ce9475e /src/com/android/settings/nfc | |
| parent | a425e86478b60c4eb1f90f47197fa244379879de (diff) | |
| parent | b637ba08ad9fb106011392fa1688e51028007ec2 (diff) | |
| download | packages_apps_Settings-8e7b9cf9f67344192de98c951c11f144d1cdcd13.zip packages_apps_Settings-8e7b9cf9f67344192de98c951c11f144d1cdcd13.tar.gz packages_apps_Settings-8e7b9cf9f67344192de98c951c11f144d1cdcd13.tar.bz2 | |
Merge "Fix tap & pay strings." into mnc-dev
Diffstat (limited to 'src/com/android/settings/nfc')
| -rw-r--r-- | src/com/android/settings/nfc/NfcForegroundPreference.java | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/com/android/settings/nfc/NfcForegroundPreference.java b/src/com/android/settings/nfc/NfcForegroundPreference.java index 4f4398f..8ee5535 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 { |