auto import from //branches/cupcake/...@130745

src/com/android/settings/bluetooth/ConnectSpecificProfilesActivity.java

@@ -25,10 +25,7 @@ import android.preference.CheckBoxPreference;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceGroup;
-import android.preference.PreferenceScreen;
 import android.text.TextUtils;
-import android.widget.ImageView;
-import android.widget.TextView;
 import android.util.Log;
 
 /**
@@ -114,7 +111,7 @@ public class ConnectSpecificProfilesActivity extends PreferenceActivity
         mManager.setForegroundActivity(this);
         mDevice.registerCallback(this);
 
-        refresh(true);
+        refresh();
     }
 
     @Override
@@ -169,7 +166,7 @@ public class ConnectSpecificProfilesActivity extends PreferenceActivity
     }
 
     private void onOnlineModeCheckedStateChanged(boolean checked) {
-        switchModes(checked, false);
+        setOnlineMode(checked, true);
     }
     
     private void onProfileCheckedStateChanged(Profile profile, boolean checked) {
@@ -187,39 +184,34 @@ public class ConnectSpecificProfilesActivity extends PreferenceActivity
     }
     
     public void onDeviceAttributesChanged(LocalBluetoothDevice device) {
-        refresh(false);
+        refresh();
     }
 
-    private void refresh(boolean forceRefresh) {
-        // The online mode could have changed
-        updateOnlineMode(forceRefresh);
+    private void refresh() {
+        // We are in 'online mode' if we are connected, connecting, or disconnecting
+        setOnlineMode(mDevice.isConnected() || mDevice.isBusy(), false);
         refreshProfiles();
-        refreshOnlineModePreference();
     }
 
-    private void updateOnlineMode(boolean force) {
-        // Connected or Connecting (and Disconnecting, which is fine)
-        boolean onlineMode = mDevice.isConnected() || mDevice.isBusy();
-        switchModes(onlineMode, force);
-    }
-    
     /**
      * Switches between online/offline mode.
      * 
      * @param onlineMode Whether to be in online mode, or offline mode.
+     * @param takeAction Whether to take action (i.e., connect or disconnect)
+     *            based on the new online mode.
      */
-    private void switchModes(boolean onlineMode, boolean force) {
-        if (mOnlineMode != onlineMode || force) {
-            mOnlineMode = onlineMode;
+    private void setOnlineMode(boolean onlineMode, boolean takeAction) {
+        mOnlineMode = onlineMode;
             
+        if (takeAction) {
             if (onlineMode) {
                 mDevice.connect();
             } else {
                 mDevice.disconnect();
             }
-
-            refreshOnlineModePreference();
         }
+            
+        refreshOnlineModePreference();
     }
     
     private void refreshOnlineModePreference() {