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 am: 17612289b4

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

Change-Id: I09c4d1815f192b1463fe2d1b6d91354f4e9149a8
This commit is contained in:
George Chang
2021-07-02 06:42:26 +00:00
committed by Automerger Merge Worker
parent 4b8e948ffa 17612289b4
commit 3f3d52481e
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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;