commit 0333b07a1e3c1c8a137596c95f6d6ca7797deb2e
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Apr 10 17:18:03 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 10 17:18:03 2019 +0000
tree f41da9279bd86db3f169ff9db51538772a6cdda3
parent 7c7dbe20c742b29b182faed3021eb83bd6086a04
parent 7b95c5d2174b15fa9710046f23cf45b7da042025

Merge "Correct SecureNfc behavior in setting page" into qt-dev

src/com/android/settings/nfc/SecureNfcEnabler.java

diff --git a/src/com/android/settings/nfc/SecureNfcEnabler.java b/src/com/android/settings/nfc/SecureNfcEnabler.java
index 065dc8b..9acaf64 100644
--- a/src/com/android/settings/nfc/SecureNfcEnabler.java
+++ b/src/com/android/settings/nfc/SecureNfcEnabler.java
@@ -46,7 +46,8 @@
                 mPreference.setEnabled(false);
                 break;
             case NfcAdapter.STATE_ON:
-                mPreference.setChecked(mPreference.isEnabled());
+                mPreference.setSummary(R.string.nfc_secure_toggle_summary);
+                mPreference.setChecked(mPreference.isChecked());
                 mPreference.setEnabled(true);
                 break;
             case NfcAdapter.STATE_TURNING_ON: