am 8d9bb1ae: Merge "Fix up Tap and Pay how it works." into mnc-dev

* commit '8d9bb1ae1d551699ba85061001ced90a157ae9ad':
  Fix up Tap and Pay how it works.
This commit is contained in:
Martijn Coenen
2015-07-14 07:57:35 +00:00
committed by Android Git Automerger
4 changed files with 80 additions and 10 deletions

View File

@@ -82,8 +82,7 @@ public class NfcPaymentPreference extends DialogPreference implements
}
setTitle(R.string.nfc_payment_default);
if (defaultApp != null) {
setSummary(mContext.getString(R.string.nfc_payment_app_and_desc,
defaultApp.label, defaultApp.description));
setSummary(defaultApp.label);
} else {
setSummary(mContext.getString(R.string.nfc_payment_default_not_set));
}