diff options
| author | Michael Bestas <mikeioannina@gmail.com> | 2015-02-18 13:39:33 +0200 |
|---|---|---|
| committer | Michael Bestas <mikeioannina@gmail.com> | 2015-12-12 07:18:40 -0800 |
| commit | 7591850311f9a5cc2d29a81b80f3ddc38ec4ca56 (patch) | |
| tree | 841b680102517d1a6d468fc640b2cf6e7e5523b2 /src/com/android/settings/nfc | |
| parent | 2055e59207e750a6ed24972d0d68282a1274995f (diff) | |
| download | packages_apps_Settings-7591850311f9a5cc2d29a81b80f3ddc38ec4ca56.zip packages_apps_Settings-7591850311f9a5cc2d29a81b80f3ddc38ec4ca56.tar.gz packages_apps_Settings-7591850311f9a5cc2d29a81b80f3ddc38ec4ca56.tar.bz2 | |
Properly remove NFC payment preference
Change-Id: Id8c9098241e018da37da93b5bd8d9c29307402c0
Diffstat (limited to 'src/com/android/settings/nfc')
| -rw-r--r-- | src/com/android/settings/nfc/NfcEnabler.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/com/android/settings/nfc/NfcEnabler.java b/src/com/android/settings/nfc/NfcEnabler.java index ae61b13..f9dff46 100644 --- a/src/com/android/settings/nfc/NfcEnabler.java +++ b/src/com/android/settings/nfc/NfcEnabler.java @@ -37,6 +37,7 @@ public class NfcEnabler implements Preference.OnPreferenceChangeListener { private final Context mContext; private final SwitchPreference mSwitch; private final PreferenceScreen mAndroidBeam; + private final PreferenceScreen mNfcPayment; private final NfcAdapter mNfcAdapter; private final IntentFilter mIntentFilter; private boolean mBeamDisallowed; @@ -53,10 +54,11 @@ public class NfcEnabler implements Preference.OnPreferenceChangeListener { }; public NfcEnabler(Context context, SwitchPreference switchPreference, - PreferenceScreen androidBeam) { + PreferenceScreen androidBeam, PreferenceScreen nfcPayment) { mContext = context; mSwitch = switchPreference; mAndroidBeam = androidBeam; + mNfcPayment = nfcPayment; mNfcAdapter = NfcAdapter.getDefaultAdapter(context); mBeamDisallowed = ((UserManager) mContext.getSystemService(Context.USER_SERVICE)) .hasUserRestriction(UserManager.DISALLOW_OUTGOING_BEAM); @@ -65,6 +67,7 @@ public class NfcEnabler implements Preference.OnPreferenceChangeListener { // NFC is not supported mSwitch.setEnabled(false); mAndroidBeam.setEnabled(false); + mNfcPayment.setEnabled(false); mIntentFilter = null; return; } @@ -113,6 +116,7 @@ public class NfcEnabler implements Preference.OnPreferenceChangeListener { mSwitch.setEnabled(true); mAndroidBeam.setEnabled(false); mAndroidBeam.setSummary(R.string.android_beam_disabled_summary); + mNfcPayment.setEnabled(false); break; case NfcAdapter.STATE_ON: mSwitch.setChecked(true); @@ -123,16 +127,19 @@ public class NfcEnabler implements Preference.OnPreferenceChangeListener { } else { mAndroidBeam.setSummary(R.string.android_beam_off_summary); } + mNfcPayment.setEnabled(true); break; case NfcAdapter.STATE_TURNING_ON: mSwitch.setChecked(true); mSwitch.setEnabled(false); mAndroidBeam.setEnabled(false); + mNfcPayment.setEnabled(false); break; case NfcAdapter.STATE_TURNING_OFF: mSwitch.setChecked(false); mSwitch.setEnabled(false); mAndroidBeam.setEnabled(false); + mNfcPayment.setEnabled(false); break; } } |