OSDN Git Service

Correct SecureNfc behavior in setting page
authorJack Yu <jackcwyu@google.com>
Tue, 9 Apr 2019 10:40:21 +0000 (18:40 +0800)
committerJack Yu <jackcwyu@google.com>
Tue, 9 Apr 2019 13:29:11 +0000 (21:29 +0800)
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

index 065dc8b..9acaf64 100644 (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: