QuickSettings : Cleanup (a42c01c4) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/quicksettings/NfcTile.java

+9 −6

Original line number	Diff line number	Diff line
		@@ -3,6 +3,7 @@ package com.android.systemui.quicksettings;
		import android.content.Context;
		import android.content.Intent;
		import android.nfc.NfcAdapter;
		import android.nfc.NfcManager;
		import android.util.Log;
		import android.view.LayoutInflater;
		import android.view.View;
		@@ -23,7 +24,7 @@ public class NfcTile extends QuickSettingsTile {
		QuickSettingsController qsc) {
		super(context, inflater, container, qsc);

		setTileState(NFC_ADAPTER_UNKNOWN);
		setTileState(getNfcState());

		mOnClick = new View.OnClickListener() {
		@Override
		@@ -90,11 +91,13 @@ public class NfcTile extends QuickSettingsTile {
		}

		private int getNfcState() {
		if (mNfcAdapter != null \|\| (mNfcAdapter = NfcAdapter.getDefaultAdapter(mContext)) != null) {
		return mNfcAdapter.getAdapterState();
		} else {
		Log.d(TAG, "No NFC adapter available");
		if (mNfcAdapter == null) {
		try {
		mNfcAdapter = NfcAdapter.getNfcAdapter(mContext);
		} catch (UnsupportedOperationException e) {
		return NFC_ADAPTER_UNKNOWN;
		}
		}
		return mNfcAdapter.getAdapterState();
		}
		}

+0 −1

Original line number	Diff line number	Diff line
		@@ -479,7 +479,6 @@ public class NavigationBarView extends LinearLayout {
		"onSizeChanged: (%dx%d) old: (%dx%d)", w, h, oldw, oldh));

		final boolean newVertical = w > 0 && h > w;
		System.out.println(newVertical + " vs " + mVertical);
		if (newVertical != mVertical) {
		mVertical = newVertical;
		//Slog.v(TAG, String.format("onSizeChanged: h=%d, w=%d, vert=%s", h, w, mVertical?"y":"n"));

+1 −6

Original line number	Diff line number	Diff line
		@@ -693,7 +693,6 @@ public class PhoneStatusBar extends BaseStatusBar {
		}
		mQS.setService(this);
		mQS.setBar(mStatusBarView);
		mQS.setupQuickSettings();

		// Start observing for changes
		mTilesChangedObserver = new TilesChangedObserver(mHandler);
		@@ -2507,7 +2506,6 @@ public class PhoneStatusBar extends BaseStatusBar {
		Slog.v(TAG, "configuration changed: " + mContext.getResources().getConfiguration());
		}
		mDisplay.getSize(mCurrentDisplaySize);

		updateResources();
		repositionNavigationBar();
		updateExpandedViewPos(EXPANDED_LEAVE_ALONE);
		@@ -2797,10 +2795,7 @@ public class PhoneStatusBar extends BaseStatusBar {
		@Override
		public void onChange(boolean selfChange) {
		if (mSettingsContainer != null) {
		// Refresh the container
		mSettingsContainer.removeAllViews();
		mQS.setupQuickSettings();
		mSettingsContainer.requestLayout();
		mQS.updateResources();
		}
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -249,7 +249,7 @@ public class QuickSettingsController {
		}
		}

		void setupQuickSettings() {
		private void setupQuickSettings() {
		LayoutInflater inflater = LayoutInflater.from(mContext);
		// Clear out old receiver
		if (mReceiver != null) {

+0 −17

Original line number	Diff line number	Diff line
		@@ -77,23 +77,6 @@ public class SettingsPanelView extends PanelView {
		}
		}

		public void setup(NetworkController networkController, BluetoothController bluetoothController,
		BatteryController batteryController, LocationController locationController) {
		if (mQS != null) {
		mQS.setupQuickSettings();
		}
		}

		void updateResources() {
		if (mQS != null) {
		mQS.updateResources();
		}
		if (mQSContainer != null) {
		mQSContainer.updateResources();
		}
		requestLayout();
		}

		@Override
		public void fling(float vel, boolean always) {
		GestureRecorder gr = ((PhoneStatusBarView) mBar).mBar.getGestureRecorder();