Merge "Correct SecureNfc behavior in setting page" into qt-dev am: 0333b07a1e

am: f7422c7e68

Change-Id: Idf69029762175b412c75769d34ca8a22e7f8d41c
This commit is contained in:
Jack Yu
2019-04-10 13:57:13 -07:00
committed by android-build-merger

View File

@@ -46,7 +46,8 @@ public class SecureNfcEnabler extends BaseNfcEnabler {
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: