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

Merge "Make NFC Setting summary text translatable" into tm-dev am: da591a4f76

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17129536

Change-Id: I16593d25303d35d1f5a37505c73fdbeb8481a6af
This commit is contained in:
TreeHugger Robot
2022-03-15 15:14:26 +00:00
committed by Automerger Merge Worker
parent e0ef422314 da591a4f76
commit 28cdf59770
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -7774,6 +7774,8 @@
<string name="nfc_payment_btn_text_set_deault">Set default</string> <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] --> <!-- Label of the Update button of the Update default payment app dialog [CHAR LIMIT=40] -->
<string name="nfc_payment_btn_text_update">Update</string> <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/> <!-- Restrictions settings --><skip/>
<!-- Restriction settings title [CHAR LIMIT=35] --> <!-- Restriction settings title [CHAR LIMIT=35] -->

3
src/com/android/settings/nfc/DefaultPaymentSettings.java
View File

@@ -143,7 +143,8 @@ public class DefaultPaymentSettings extends DefaultAppPickerFragment {
CandidateInfo info, String defaultKey, String systemDefaultKey) { CandidateInfo info, String defaultKey, String systemDefaultKey) {
final NfcPaymentCandidateInfo candidateInfo = (NfcPaymentCandidateInfo) info; final NfcPaymentCandidateInfo candidateInfo = (NfcPaymentCandidateInfo) info;
if (candidateInfo.isManagedProfile()) { if (candidateInfo.isManagedProfile()) {
pref.setSummary("Work"); final String textWork = getContext().getString(R.string.nfc_work_text);
pref.setSummary(textWork);
} }
} }