PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NFC Settings cleanup.

Browse Source 
NFC service now tracks its own settings. Call the NFC API to determine
state.

Change-Id: Ibdb33e68abdbe36df31fb13ad95c8ca1b3bcb35b
Signed-off-by: Nick Pelly <npelly@google.com>
This commit is contained in:
Nick Pelly
2010-10-20 18:42:23 -07:00
parent f2917ac3c5
commit e16f78d54a
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/nfc/NfcEnabler.java
View File

@@ -77,8 +77,7 @@ public class NfcEnabler implements Preference.OnPreferenceChangeListener {
} }
mContext.registerReceiver(mReceiver, mIntentFilter); mContext.registerReceiver(mReceiver, mIntentFilter);
mCheckbox.setOnPreferenceChangeListener(this); mCheckbox.setOnPreferenceChangeListener(this);
mNfcState = Settings.System.getInt(mContext.getContentResolver(), mNfcState = mNfcAdapter.isEnabled();
Settings.System.NFC_ON, 0) != 0;
mCheckbox.setChecked(mNfcState); mCheckbox.setChecked(mNfcState);
} }
@@ -103,9 +102,9 @@ public class NfcEnabler implements Preference.OnPreferenceChangeListener {
Log.d(TAG, "Setting NFC enabled state to: " + desiredState); Log.d(TAG, "Setting NFC enabled state to: " + desiredState);
boolean success = false; boolean success = false;
if (desiredState) { if (desiredState) {
success = mNfcAdapter.enableTagDiscovery(); success = mNfcAdapter.enable();
} else { } else {
success = mNfcAdapter.disableTagDiscovery(); success = mNfcAdapter.disable();
} }
if (success) { if (success) {
Log.d(TAG, "Successfully changed NFC enabled state to " + desiredState); Log.d(TAG, "Successfully changed NFC enabled state to " + desiredState);