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

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

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

Change-Id: Ic46613a626882f06ac273c1cfb9dc1020889db33
This commit is contained in:
George Chang
2021-07-02 06:38:16 +00:00
committed by Automerger Merge Worker
parent 58d95b41c9 cd4a4ad90a
commit 3096bae20d
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/values/strings.xml
View File

@@ -10030,6 +10030,10 @@
<string name="switch_on_text">On</string> <string name="switch_on_text">On</string>
<string name="switch_off_text">Off</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] --> <!-- The subtext when screen pinning feature is enabled. [CHAR LIMIT=28] -->
<string name="screen_pinning_switch_on_text">On</string> <string name="screen_pinning_switch_on_text">On</string>

4
src/com/android/settings/connecteddevice/NfcAndPaymentFragmentController.java
View File

@@ -54,9 +54,9 @@ public class NfcAndPaymentFragmentController extends BasePreferenceController {
public CharSequence getSummary() { public CharSequence getSummary() {
if (mNfcAdapter != null) { if (mNfcAdapter != null) {
if (mNfcAdapter.isEnabled()) { if (mNfcAdapter.isEnabled()) {
return mContext.getText(R.string.switch_on_text); return mContext.getText(R.string.nfc_setting_on);
} else { } else {
return mContext.getText(R.string.switch_off_text); return mContext.getText(R.string.nfc_setting_off);
} }
} }
return null; return null;