Merge "make bluetooth iconography consistent with other quicksettings icons." into jb-mr1-dev

Author: cwren

packages/SystemUI/res/drawable-hdpi/ic_qs_bluetooth_not_connected.png

@@ -20,6 +20,7 @@
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.PendingIntent;
+import android.bluetooth.BluetoothAdapter;
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.Context;
@@ -81,6 +82,7 @@ class QuickSettings {
     private DisplayManager mDisplayManager;
     private WifiDisplayStatus mWifiDisplayStatus;
     private PhoneStatusBar mStatusBarService;
+    private QuickSettingsModel.BluetoothState mBluetoothState;
 
     private BrightnessController mBrightnessController;
     private BluetoothController mBluetoothController;
@@ -115,6 +117,7 @@ public QuickSettings(Context context, QuickSettingsContainerView container) {
         mContainerView = container;
         mModel = new QuickSettingsModel(context);
         mWifiDisplayStatus = new WifiDisplayStatus();
+        mBluetoothState = new QuickSettingsModel.BluetoothState();
         mHandler = new Handler();
 
         Resources r = mContext.getResources();
@@ -128,6 +131,7 @@ public QuickSettings(Context context, QuickSettingsContainerView container) {
 
         IntentFilter filter = new IntentFilter();
         filter.addAction(DisplayManager.ACTION_WIFI_DISPLAY_STATUS_CHANGED);
+        filter.addAction(BluetoothAdapter.ACTION_CONNECTION_STATE_CHANGED);
         mContext.registerReceiver(mReceiver, filter);
     }
 
@@ -739,6 +743,10 @@ private void applyWifiDisplayStatus() {
         mModel.onWifiDisplayStateChanged(mWifiDisplayStatus);
     }
 
+    private void applyBluetoothStatus() {
+        mModel.onBluetoothStateChange(mBluetoothState);
+    }
+
     private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
@@ -748,6 +756,12 @@ public void onReceive(Context context, Intent intent) {
                 mWifiDisplayStatus = status;
                 applyWifiDisplayStatus();
             }
+            if (intent.getAction().equals(BluetoothAdapter.ACTION_CONNECTION_STATE_CHANGED)) {
+                int status = intent.getIntExtra(BluetoothAdapter.EXTRA_CONNECTION_STATE,
+                        BluetoothAdapter.STATE_DISCONNECTED);
+                mBluetoothState.connected = (status == BluetoothAdapter.STATE_CONNECTED);
+                applyBluetoothStatus();
+            }
         }
     };
 }