Merge "Make nfc toggability logic static and public." into oc-dr1-dev (ea39f74a) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/nfc/NfcPreferenceController.java

+7 −3

Original line number	Diff line number	Diff line
		@@ -64,10 +64,8 @@ public class NfcPreferenceController extends AbstractPreferenceController
		mBeamPreference = (RestrictedPreference) screen.findPreference(
		KEY_ANDROID_BEAM_SETTINGS);
		mNfcEnabler = new NfcEnabler(mContext, mNfcPreference, mBeamPreference);
		String toggleable = Settings.Global.getString(mContext.getContentResolver(),
		Settings.Global.AIRPLANE_MODE_TOGGLEABLE_RADIOS);
		// Manually set dependencies for NFC when not toggleable.
		if (toggleable == null \|\| !toggleable.contains(Settings.Global.RADIO_NFC)) {
		if (!isToggleableInAirplaneMode(mContext)) {
		mAirplaneModeObserver = new AirplaneModeObserver();
		updateNfcPreference();
		}
		@@ -131,6 +129,12 @@ public class NfcPreferenceController extends AbstractPreferenceController
		mBeamPreference.setEnabled(toggleable);
		}

		public static boolean isToggleableInAirplaneMode(Context context) {
		String toggleable = Settings.Global.getString(context.getContentResolver(),
		Settings.Global.AIRPLANE_MODE_TOGGLEABLE_RADIOS);
		return toggleable != null && toggleable.contains(Settings.Global.RADIO_NFC);
		}

		private final class AirplaneModeObserver extends ContentObserver {
		private final Uri AIRPLANE_MODE_URI =
		Settings.Global.getUriFor(Settings.Global.AIRPLANE_MODE_ON);