Merge "resolve merge conflicts of 8c1e6e49f95b to oc-dev-plus-aosp" into oc-dev-plus-aosp (57f58037) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/qs/tiles/NfcTile.java

+15 −12

Original line number	Diff line number	Diff line
		@@ -56,13 +56,6 @@ public class NfcTile extends QSTileImpl<BooleanState> {
		if (mListening) {
		mContext.registerReceiver(mNfcReceiver,
		new IntentFilter(NfcAdapter.ACTION_ADAPTER_STATE_CHANGED));
		if (mAdapter == null) {
		try {
		mAdapter = NfcAdapter.getNfcAdapter(mContext);
		} catch (UnsupportedOperationException e) {
		mAdapter = null;
		}
		}
		} else {
		mContext.unregisterReceiver(mNfcReceiver);
		}
		@@ -84,11 +77,10 @@ public class NfcTile extends QSTileImpl<BooleanState> {

		@Override
		protected void handleClick() {
		if (mAdapter == null) return;
		if (!mAdapter.isEnabled()) {
		mAdapter.enable();
		if (!getAdapter().isEnabled()) {
		getAdapter().enable();
		} else {
		mAdapter.disable();
		getAdapter().disable();
		}
		}

		@@ -106,7 +98,7 @@ public class NfcTile extends QSTileImpl<BooleanState> {
		protected void handleUpdateState(BooleanState state, Object arg) {
		final Drawable mEnable = mContext.getDrawable(R.drawable.ic_qs_nfc_enabled);
		final Drawable mDisable = mContext.getDrawable(R.drawable.ic_qs_nfc_disabled);
		state.value = mAdapter == null ? false : mAdapter.isEnabled();
		state.value = getAdapter().isEnabled();
		state.label = mContext.getString(R.string.quick_settings_nfc_label);
		state.icon = new DrawableIcon(state.value ? mEnable : mDisable);
		state.expandedAccessibilityClassName = Switch.class.getName();
		@@ -127,6 +119,17 @@ public class NfcTile extends QSTileImpl<BooleanState> {
		}
		}

		private NfcAdapter getAdapter() {
		if (mAdapter == null) {
		try {
		mAdapter = NfcAdapter.getNfcAdapter(mContext);
		} catch (UnsupportedOperationException e) {
		mAdapter = null;
		}
		}
		return mAdapter;
		}

		private BroadcastReceiver mNfcReceiver = new BroadcastReceiver() {
		@Override
		public void onReceive(Context context, Intent intent) {