QuickSettings : Cleanup

Change-Id: I044f8c0914c725af5894ffb70e8ac54b6e19dc43

Author: Danesh

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

@@ -3,6 +3,7 @@
 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 NfcTile(Context context, LayoutInflater inflater,
             QuickSettingsController qsc) {
         super(context, inflater, container, qsc);
 
-        setTileState(NFC_ADAPTER_UNKNOWN);
+        setTileState(getNfcState());
 
         mOnClick = new View.OnClickListener() {
             @Override
@@ -90,11 +91,13 @@ private void setTileState(int state) {
     }
 
     private int getNfcState() {
-        if (mNfcAdapter != null || (mNfcAdapter = NfcAdapter.getDefaultAdapter(mContext)) != null) {
-            return mNfcAdapter.getAdapterState();
-        } else {
-            Log.d(TAG, "No NFC adapter available");
-            return NFC_ADAPTER_UNKNOWN;
+        if (mNfcAdapter == null) {
+            try {
+                mNfcAdapter = NfcAdapter.getNfcAdapter(mContext);
+            } catch (UnsupportedOperationException e) {
+                return NFC_ADAPTER_UNKNOWN;
+            }
         }
+        return mNfcAdapter.getAdapterState();
     }
 }

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

@@ -585,7 +585,6 @@ public void onSizeChanged(View view, int w, int h, int oldw, int oldh) {
                 }
                 mQS.setService(this);
                 mQS.setBar(mStatusBarView);
-                mQS.setupQuickSettings();
 
                 // Start observing for changes
                 mTilesChangedObserver = new TilesChangedObserver(mHandler);
@@ -2382,7 +2381,6 @@ else if (Intent.ACTION_CONFIGURATION_CHANGED.equals(action)) {
                     Slog.v(TAG, "configuration changed: " + mContext.getResources().getConfiguration());
                 }
                 mDisplay.getSize(mCurrentDisplaySize);
-
                 updateResources();
                 repositionNavigationBar();
                 updateExpandedViewPos(EXPANDED_LEAVE_ALONE);
@@ -2677,10 +2675,7 @@ public TilesChangedObserver(Handler handler) {
         @Override
         public void onChange(boolean selfChange) {
             if (mSettingsContainer != null) {
-                // Refresh the container
-                mSettingsContainer.removeAllViews();
-                mQS.setupQuickSettings();
-                mSettingsContainer.requestLayout();
+                mQS.updateResources();
             }
         }
 

packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsController.java

@@ -249,7 +249,7 @@ void loadTiles() {
         }
     }
 
-    void setupQuickSettings() {
+    private void setupQuickSettings() {
         LayoutInflater inflater = LayoutInflater.from(mContext);
         // Clear out old receiver
         if (mReceiver != null) {

packages/SystemUI/src/com/android/systemui/statusbar/phone/SettingsPanelView.java

@@ -84,23 +84,6 @@ public void setImeWindowStatus(boolean visible) {
         }
     }
 
-    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();