Bring back the Android Beam settings panel.
Bug: 5350022 Change-Id: I22d2c6f91f7ab86501021fe97a2d57b109ed10bf
This commit is contained in:
@@ -23,6 +23,9 @@ import android.content.IntentFilter;
|
||||
import android.nfc.NfcAdapter;
|
||||
import android.preference.CheckBoxPreference;
|
||||
import android.preference.Preference;
|
||||
import android.preference.PreferenceScreen;
|
||||
|
||||
import com.android.settings.R;
|
||||
|
||||
/**
|
||||
* NfcEnabler is a helper to manage the Nfc on/off checkbox preference. It is
|
||||
@@ -32,6 +35,7 @@ import android.preference.Preference;
|
||||
public class NfcEnabler implements Preference.OnPreferenceChangeListener {
|
||||
private final Context mContext;
|
||||
private final CheckBoxPreference mCheckbox;
|
||||
private final PreferenceScreen mAndroidBeam;
|
||||
private final NfcAdapter mNfcAdapter;
|
||||
private final IntentFilter mIntentFilter;
|
||||
|
||||
@@ -46,14 +50,17 @@ public class NfcEnabler implements Preference.OnPreferenceChangeListener {
|
||||
}
|
||||
};
|
||||
|
||||
public NfcEnabler(Context context, CheckBoxPreference checkBoxPreference) {
|
||||
public NfcEnabler(Context context, CheckBoxPreference checkBoxPreference,
|
||||
PreferenceScreen androidBeam) {
|
||||
mContext = context;
|
||||
mCheckbox = checkBoxPreference;
|
||||
mAndroidBeam = androidBeam;
|
||||
mNfcAdapter = NfcAdapter.getDefaultAdapter(context);
|
||||
|
||||
if (mNfcAdapter == null) {
|
||||
// NFC is not supported
|
||||
mCheckbox.setEnabled(false);
|
||||
mAndroidBeam.setEnabled(false);
|
||||
mIntentFilter = null;
|
||||
return;
|
||||
}
|
||||
@@ -97,18 +104,28 @@ public class NfcEnabler implements Preference.OnPreferenceChangeListener {
|
||||
case NfcAdapter.STATE_OFF:
|
||||
mCheckbox.setChecked(false);
|
||||
mCheckbox.setEnabled(true);
|
||||
mAndroidBeam.setEnabled(false);
|
||||
mAndroidBeam.setSummary(R.string.android_beam_disabled_summary);
|
||||
break;
|
||||
case NfcAdapter.STATE_ON:
|
||||
mCheckbox.setChecked(true);
|
||||
mCheckbox.setEnabled(true);
|
||||
mAndroidBeam.setEnabled(true);
|
||||
if (mNfcAdapter.isNdefPushEnabled()) {
|
||||
mAndroidBeam.setSummary(R.string.android_beam_on_summary);
|
||||
} else {
|
||||
mAndroidBeam.setSummary(R.string.android_beam_off_summary);
|
||||
}
|
||||
break;
|
||||
case NfcAdapter.STATE_TURNING_ON:
|
||||
mCheckbox.setChecked(true);
|
||||
mCheckbox.setEnabled(false);
|
||||
mAndroidBeam.setEnabled(false);
|
||||
break;
|
||||
case NfcAdapter.STATE_TURNING_OFF:
|
||||
mCheckbox.setChecked(false);
|
||||
mCheckbox.setEnabled(false);
|
||||
mAndroidBeam.setEnabled(false);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user