Merge "Make NFC Setting summary text translatable" into tm-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
da591a4f76
@@ -7774,6 +7774,8 @@
|
||||
<string name="nfc_payment_btn_text_set_deault">Set default</string>
|
||||
<!-- Label of the Update button of the Update default payment app dialog [CHAR LIMIT=40] -->
|
||||
<string name="nfc_payment_btn_text_update">Update</string>
|
||||
<!-- Summary text of the work apps in the default payment selection list [CHAR LIMIT=20]-->
|
||||
<string name="nfc_work_text">Work</string>
|
||||
<!-- Restrictions settings --><skip/>
|
||||
|
||||
<!-- Restriction settings title [CHAR LIMIT=35] -->
|
||||
|
@@ -143,7 +143,8 @@ public class DefaultPaymentSettings extends DefaultAppPickerFragment {
|
||||
CandidateInfo info, String defaultKey, String systemDefaultKey) {
|
||||
final NfcPaymentCandidateInfo candidateInfo = (NfcPaymentCandidateInfo) info;
|
||||
if (candidateInfo.isManagedProfile()) {
|
||||
pref.setSummary("Work");
|
||||
final String textWork = getContext().getString(R.string.nfc_work_text);
|
||||
pref.setSummary(textWork);
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user