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

This commit is contained in:
TreeHugger Robot
2019-04-10 17:18:03 +00:00
committed by Android (Google) Code Review

View File

@@ -46,7 +46,8 @@ public class SecureNfcEnabler extends BaseNfcEnabler {
mPreference.setEnabled(false); mPreference.setEnabled(false);
break; break;
case NfcAdapter.STATE_ON: case NfcAdapter.STATE_ON:
mPreference.setChecked(mPreference.isEnabled()); mPreference.setSummary(R.string.nfc_secure_toggle_summary);
mPreference.setChecked(mPreference.isChecked());
mPreference.setEnabled(true); mPreference.setEnabled(true);
break; break;
case NfcAdapter.STATE_TURNING_ON: case NfcAdapter.STATE_TURNING_ON: