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

am cd99332f: Merge "Update settings app for new NFC API." into gingerbread

Browse Source 
Merge commit 'cd99332fee649afd85798499cea5c45a098b8a20' into gingerbread-plus-aosp

* commit 'cd99332fee649afd85798499cea5c45a098b8a20':
  Update settings app for new NFC API.
This commit is contained in:
Nick Pelly
2010-10-12 19:04:17 -07:00
committed by Android Git Automerger
parent 52e8542d9d cd99332fee
commit b3c4365d10
1 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,9 +17,8 @@
package com.android.settings.nfc; package com.android.settings.nfc;
import com.android.settings.R; import com.android.settings.R;
import com.trustedlogic.trustednfc.android.NfcException;
import com.trustedlogic.trustednfc.android.NfcManager;
import android.content.Context; import android.content.Context;
import android.nfc.NfcAdapter;
import android.preference.Preference; import android.preference.Preference;
import android.preference.CheckBoxPreference; import android.preference.CheckBoxPreference;
import android.provider.Settings; import android.provider.Settings;
@@ -35,23 +34,23 @@ public class NfcEnabler implements Preference.OnPreferenceChangeListener {
private final Context mContext; private final Context mContext;
private final CheckBoxPreference mCheckbox; private final CheckBoxPreference mCheckbox;
private final NfcManager mNfcManager; private final NfcAdapter mNfcAdapter;
private boolean mNfcState; private boolean mNfcState;
public NfcEnabler(Context context, CheckBoxPreference checkBoxPreference) { public NfcEnabler(Context context, CheckBoxPreference checkBoxPreference) {
mContext = context; mContext = context;
mCheckbox = checkBoxPreference; mCheckbox = checkBoxPreference;
mNfcManager = (NfcManager) context.getSystemService(Context.NFC_SERVICE); mNfcAdapter = NfcAdapter.getDefaultAdapter();
if (mNfcManager == null) { if (mNfcAdapter == null) {
// NFC is not supported // NFC is not supported
mCheckbox.setEnabled(false); mCheckbox.setEnabled(false);
} }
} }
public void resume() { public void resume() {
if (mNfcManager == null) { if (mNfcAdapter == null) {
return; return;
} }
mCheckbox.setOnPreferenceChangeListener(this); mCheckbox.setOnPreferenceChangeListener(this);
@@ -61,7 +60,7 @@ public class NfcEnabler implements Preference.OnPreferenceChangeListener {
} }
public void pause() { public void pause() {
if (mNfcManager == null) { if (mNfcAdapter == null) {
return; return;
} }
mCheckbox.setOnPreferenceChangeListener(null); mCheckbox.setOnPreferenceChangeListener(null);
@@ -77,18 +76,13 @@ public class NfcEnabler implements Preference.OnPreferenceChangeListener {
private void setEnabled() { private void setEnabled() {
if (mNfcState) { if (mNfcState) {
try { if (!mNfcAdapter.enableTagDiscovery()) {
mNfcManager.enable(); Log.w(TAG, "NFC enabling failed");
} catch (NfcException e) {
Log.w(TAG, "NFC enabling failed: " + e.getMessage());
mNfcState = false; mNfcState = false;
} }
} else { } else {
try { if (!mNfcAdapter.disableTagDiscovery()) {
mNfcManager.disable(); Log.w(TAG, "NFC disabling failed");
} catch (NfcException e) {
Log.w(TAG, "NFC disabling failed: " + e.getMessage());
mNfcState = true; mNfcState = true;
} }
} }