Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17508c9c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I565b2bfada1fa78137022d8fe9a5f0a0424344ad
parents 8a617901 da591a4f

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -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] -->

























src/com/android/settings/nfc/DefaultPaymentSettings.java



+2
−1






























Original line number
Diff line number
Diff line







@@ -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);









        }









    }