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

Commit 17612289 authored by George Chang's avatar George Chang Committed by Automerger Merge Worker
Browse files

Merge "Separate NFC on/off strings" into sc-dev am: cd4a4ad9 

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

Change-Id: I9f77c47ba941ae489598b5dcc930c00e20c36222
parents 37f74d4a cd4a4ad9

res/values/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -10030,6 +10030,10 @@ 
    <string name="switch_on_text">On</string>

    <string name="switch_off_text">Off</string>









    <!-- Switch text for nfc feature being on [CHAR LIMIT=NONE] -->









    <string name="nfc_setting_on">On</string>









    <!-- Switch text for nfc feature being off [CHAR LIMIT=NONE] -->









    <string name="nfc_setting_off">Off</string>

















    <!-- The subtext when screen pinning feature is enabled. [CHAR LIMIT=28] -->









    <string name="screen_pinning_switch_on_text">On</string>

























src/com/android/settings/connecteddevice/NfcAndPaymentFragmentController.java



+2
−2






























Original line number
Diff line number
Diff line







@@ -54,9 +54,9 @@ public class NfcAndPaymentFragmentController extends BasePreferenceController {







    public CharSequence getSummary() {









        if (mNfcAdapter != null) {









            if (mNfcAdapter.isEnabled()) {









                return mContext.getText(R.string.switch_on_text);









                return mContext.getText(R.string.nfc_setting_on);









            } else {









                return mContext.getText(R.string.switch_off_text);









                return mContext.getText(R.string.nfc_setting_off);









            }









        }









        return null;