From 96b5af7e397ede1d09681811d382e8ee82501a4c Mon Sep 17 00:00:00 2001 From: George Chang Date: Fri, 2 Jul 2021 11:00:55 +0800 Subject: [PATCH] Separate NFC on/off strings For pt-BR, it needs a different gender when we are referring to "NFC". Bug: 189314407 Test: check On/Off strings Change-Id: I87da43c66a65b3ef2fcd9c57632b36302d9920e8 --- res/values/strings.xml | 4 ++++ .../connecteddevice/NfcAndPaymentFragmentController.java | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 62c59e1d013..ac06f735143 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -10030,6 +10030,10 @@ On Off + + On + + Off On diff --git a/src/com/android/settings/connecteddevice/NfcAndPaymentFragmentController.java b/src/com/android/settings/connecteddevice/NfcAndPaymentFragmentController.java index 17958c96010..ee0021ec951 100644 --- a/src/com/android/settings/connecteddevice/NfcAndPaymentFragmentController.java +++ b/src/com/android/settings/connecteddevice/NfcAndPaymentFragmentController.java @@ -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;