commit 7b95c5d2174b15fa9710046f23cf45b7da042025
author Jack Yu <jackcwyu@google.com> Tue Apr 09 18:40:21 2019 +0800
committer Jack Yu <jackcwyu@google.com> Tue Apr 09 21:29:11 2019 +0800
tree be6ab9568120e9131fdcec0380281506887600de
parent 8bf3ab9d5c6b91889cca50c2371441f04cb6d38e

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

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: