From 7b95c5d2174b15fa9710046f23cf45b7da042025 Mon Sep 17 00:00:00 2001 From: Jack Yu Date: Tue, 9 Apr 2019 18:40:21 +0800 Subject: [PATCH] Correct SecureNfc behavior in setting page 1. String under SecureNfc should update immediately when NFC toggle 2. SecureNfc state should remain the same after NFC toggle Bug: 129037278 Test: Toggle NFC/SecureNfc option and check behavior Change-Id: I9cbac4951f0c70accd92c43fc62658cb5dbb5c9b --- src/com/android/settings/nfc/SecureNfcEnabler.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/nfc/SecureNfcEnabler.java b/src/com/android/settings/nfc/SecureNfcEnabler.java index 065dc8b6a23..9acaf6461f2 100644 --- a/src/com/android/settings/nfc/SecureNfcEnabler.java +++ b/src/com/android/settings/nfc/SecureNfcEnabler.java @@ -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: