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

am 781c0aa2: Merge "NFC Settings cleanup." into gingerbread

Browse Source 
Merge commit '781c0aa21ed1e4a38dc3ec1a5facc7be48386571' into gingerbread-plus-aosp

* commit '781c0aa21ed1e4a38dc3ec1a5facc7be48386571':
  NFC Settings cleanup.
This commit is contained in:
Nick Pelly
2010-10-21 09:37:55 -07:00
committed by Android Git Automerger
parent 149fec6a89 781c0aa21e
commit 26d6e4704a
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);