Merge "launch: Refresh AVD selector dialog during initial setup"

1 files changed, 14 insertions, 8 deletions

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/EmulatorConfigTab.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/EmulatorConfigTab.java
index e01bfab..f1c61c7 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/EmulatorConfigTab.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/EmulatorConfigTab.java
@@ -219,14 +219,7 @@ public class EmulatorConfigTab extends AbstractLaunchConfigurationTab {
         SelectionListener targetModeChangeListener = new SelectionAdapter() {
             @Override
             public void widgetSelected(SelectionEvent e) {
-                updateLaunchConfigurationDialog();
-
-                boolean auto = mAutoTargetButton.getSelection();
-                mPreferredAvdSelector.setEnabled(auto);
-                mPreferredAvdLabel.setEnabled(auto);
-
-                boolean all = mAllDevicesTargetButton.getSelection();
-                mDeviceTypeCombo.setEnabled(all);
+                targetModeChanged();
             }
         };
 
@@ -358,6 +351,17 @@ public class EmulatorConfigTab extends AbstractLaunchConfigurationTab {
         });
     }
 
+    private void targetModeChanged() {
+        updateLaunchConfigurationDialog();
+
+        boolean auto = mAutoTargetButton.getSelection();
+        mPreferredAvdSelector.setEnabled(auto);
+        mPreferredAvdLabel.setEnabled(auto);
+
+        boolean all = mAllDevicesTargetButton.getSelection();
+        mDeviceTypeCombo.setEnabled(all);
+    }
+
     /* (non-Javadoc)
      * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName()
      */
@@ -427,6 +431,8 @@ public class EmulatorConfigTab extends AbstractLaunchConfigurationTab {
         mManualTargetButton.setSelection(mode == TargetMode.MANUAL);
         mAllDevicesTargetButton.setSelection(multipleDevices);
 
+        targetModeChanged();
+
         mDeviceTypeCombo.setEnabled(multipleDevices);
         if (multipleDevices) {
             int index = 0;