PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix tap & pay strings." into mnc-dev

Browse Source
This commit is contained in:
Martijn Coenen
2015-07-29 07:54:04 +00:00
committed by Android (Google) Code Review
parent a425e86478 b637ba08ad
commit 8e7b9cf9f6
2 changed files with 10 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/settings/nfc/NfcForegroundPreference.java
View File

@@ -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 {