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

Browse Source
This commit is contained in:
George Chang
2021-07-02 06:23:03 +00:00
committed by Android (Google) Code Review
parent 77f0dbaa26 96b5af7e39
commit cd4a4ad90a
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_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>

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

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