Merge change 3622 into donut

* changes:
  Move the custom widgets for avd/targets/apk-config into internal.widgets

8 files changed, 26 insertions, 26 deletions

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF
index 751d33d..cce59c2 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF
@@ -99,8 +99,8 @@ Export-Package: com.android.ide.eclipse.adt;x-friends:="com.android.ide.eclipse.
  com.android.sdklib.internal.repository;x-friends:="com.android.ide.eclipse.tests",
  com.android.sdklib.repository;x-friends:="com.android.ide.eclipse.tests",
  com.android.sdkstats;x-friends:="com.android.ide.eclipse.tests",
- com.android.sdkuilib;x-friends:="com.android.ide.eclipse.tests",
  com.android.sdkuilib.internal.repository;x-friends:="com.android.ide.eclipse.tests",
+ com.android.sdkuilib.internal.widgets;x-friends:="com.android.ide.eclipse.tests",
  com.android.sdkuilib.repository;x-friends:="com.android.ide.eclipse.tests"
 
 
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/DeviceChooserDialog.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/DeviceChooserDialog.java
index a403f5a..3bc68fe 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/DeviceChooserDialog.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/DeviceChooserDialog.java
@@ -31,8 +31,8 @@ import com.android.ide.eclipse.ddms.DdmsPlugin;
 import com.android.sdklib.IAndroidTarget;
 import com.android.sdklib.internal.avd.AvdManager;
 import com.android.sdklib.internal.avd.AvdManager.AvdInfo;
-import com.android.sdkuilib.AvdSelector;
-import com.android.sdkuilib.AvdSelector.SelectionMode;
+import com.android.sdkuilib.internal.widgets.AvdSelector;
+import com.android.sdkuilib.internal.widgets.AvdSelector.SelectionMode;
 
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
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 1bba718..664babe 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
@@ -26,8 +26,8 @@ import com.android.prefs.AndroidLocation.AndroidLocationException;
 import com.android.sdklib.IAndroidTarget;
 import com.android.sdklib.internal.avd.AvdManager;
 import com.android.sdklib.internal.avd.AvdManager.AvdInfo;
-import com.android.sdkuilib.AvdSelector;
-import com.android.sdkuilib.AvdSelector.SelectionMode;
+import com.android.sdkuilib.internal.widgets.AvdSelector;
+import com.android.sdkuilib.internal.widgets.AvdSelector.SelectionMode;
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/preferences/AndroidPreferencePage.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/preferences/AndroidPreferencePage.java
index f6969f8..6f4772b 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/preferences/AndroidPreferencePage.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/preferences/AndroidPreferencePage.java
@@ -20,7 +20,7 @@ import com.android.ide.eclipse.adt.AdtPlugin;
 import com.android.ide.eclipse.adt.internal.sdk.Sdk;
 import com.android.ide.eclipse.adt.internal.sdk.Sdk.ITargetChangeListener;
 import com.android.sdklib.IAndroidTarget;
-import com.android.sdkuilib.SdkTargetSelector;
+import com.android.sdkuilib.internal.widgets.SdkTargetSelector;
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.jface.preference.DirectoryFieldEditor;
@@ -68,7 +68,7 @@ public class AndroidPreferencePage extends FieldEditorPreferencePage implements
 
         mDirectoryField = new SdkDirectoryFieldEditor(AdtPlugin.PREFS_SDK_DIR,
                 Messages.AndroidPreferencePage_SDK_Location_, getFieldEditorParent());
-        
+
         addField(mDirectoryField);
     }
 
@@ -79,11 +79,11 @@ public class AndroidPreferencePage extends FieldEditorPreferencePage implements
      */
     public void init(IWorkbench workbench) {
     }
-    
+
     @Override
     public void dispose() {
         super.dispose();
-        
+
         if (mDirectoryField != null) {
             mDirectoryField.dispose();
             mDirectoryField = null;
@@ -120,12 +120,12 @@ public class AndroidPreferencePage extends FieldEditorPreferencePage implements
         protected boolean doCheckState() {
             String fileName = getTextControl().getText();
             fileName = fileName.trim();
-            
+
             if (fileName.indexOf(',') >= 0 || fileName.indexOf(';') >= 0) {
                 setErrorMessage(Messages.AndroidPreferencePage_ERROR_Reserved_Char);
                 return false;  // Apply/OK must be disabled
             }
-            
+
             File file = new File(fileName);
             if (!file.isDirectory()) {
                 setErrorMessage(JFaceResources.getString(
@@ -170,18 +170,18 @@ public class AndroidPreferencePage extends FieldEditorPreferencePage implements
             gd = new GridData(GridData.FILL_HORIZONTAL);
             gd.horizontalSpan = numColumns;
             l.setLayoutData(gd);
-            
+
             try {
                 // We may not have an sdk if the sdk path pref is empty or not valid.
                 Sdk sdk = Sdk.getCurrent();
                 IAndroidTarget[] targets = sdk != null ? sdk.getTargets() : null;
-                
+
                 mTargetSelector = new SdkTargetSelector(parent,
                         targets,
                         false /*allowSelection*/);
                 gd = (GridData) mTargetSelector.getLayoutData();
                 gd.horizontalSpan = numColumns;
-                
+
                 if (mTargetChangeListener == null) {
                     mTargetChangeListener = new TargetChangedListener();
                     AdtPlugin.getDefault().addTargetListener(mTargetChangeListener);
@@ -193,7 +193,7 @@ public class AndroidPreferencePage extends FieldEditorPreferencePage implements
                 AdtPlugin.log(e, "SdkTargetSelector failed");
             }
         }
-        
+
         @Override
         public void dispose() {
             super.dispose();
@@ -202,7 +202,7 @@ public class AndroidPreferencePage extends FieldEditorPreferencePage implements
                 mTargetChangeListener = null;
             }
         }
-        
+
         private class TargetChangedListener implements ITargetChangeListener {
             public void onProjectTargetChange(IProject changedProject) {
                 // do nothing.
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/properties/AndroidPropertyPage.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/properties/AndroidPropertyPage.java
index f6f5f67..7dc4ae2 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/properties/AndroidPropertyPage.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/properties/AndroidPropertyPage.java
@@ -18,8 +18,8 @@ package com.android.ide.eclipse.adt.internal.properties;
 
 import com.android.ide.eclipse.adt.internal.sdk.Sdk;
 import com.android.sdklib.IAndroidTarget;
-import com.android.sdkuilib.ApkConfigWidget;
-import com.android.sdkuilib.SdkTargetSelector;
+import com.android.sdkuilib.internal.widgets.ApkConfigWidget;
+import com.android.sdkuilib.internal.widgets.SdkTargetSelector;
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.swt.SWT;
@@ -69,7 +69,7 @@ public class AndroidPropertyPage extends PropertyPage implements IWorkbenchPrope
 
         Label l = new Label(top, SWT.NONE);
         l.setText("Project Build Target");
-        
+
         mSelector = new SdkTargetSelector(top, targets);
 
         l = new Label(top, SWT.SEPARATOR | SWT.HORIZONTAL);
@@ -88,7 +88,7 @@ public class AndroidPropertyPage extends PropertyPage implements IWorkbenchPrope
             if (target != null) {
                 mSelector.setSelection(target);
             }
-            
+
             // get the apk configurations
             Map<String, String> configs = currentSdk.getProjectApkConfigs(mProject);
             mApkConfigWidget.fillTable(configs);
@@ -102,7 +102,7 @@ public class AndroidPropertyPage extends PropertyPage implements IWorkbenchPrope
                 setValid(target != null);
             }
         });
-        
+
         if (mProject.isOpen() == false) {
             // disable the ui.
         }
@@ -117,7 +117,7 @@ public class AndroidPropertyPage extends PropertyPage implements IWorkbenchPrope
             currentSdk.setProject(mProject, mSelector.getSelected(),
                     mApkConfigWidget.getApkConfigs());
         }
-        
+
         return true;
     }
 }
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/avdmanager/AvdManagerListPage.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/avdmanager/AvdManagerListPage.java
index 562e70f..0ce569c 100755
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/avdmanager/AvdManagerListPage.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/avdmanager/AvdManagerListPage.java
@@ -26,8 +26,8 @@ import com.android.sdklib.IAndroidTarget;
 import com.android.sdklib.ISdkLog;
 import com.android.sdklib.internal.avd.AvdManager;
 import com.android.sdklib.internal.avd.AvdManager.AvdInfo;
-import com.android.sdkuilib.AvdSelector;
-import com.android.sdkuilib.AvdSelector.SelectionMode;
+import com.android.sdkuilib.internal.widgets.AvdSelector;
+import com.android.sdkuilib.internal.widgets.AvdSelector.SelectionMode;
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.jface.wizard.WizardPage;
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newproject/NewProjectCreationPage.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newproject/NewProjectCreationPage.java
index cf0dc00..95b6ea1 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newproject/NewProjectCreationPage.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newproject/NewProjectCreationPage.java
@@ -33,7 +33,7 @@ import com.android.sdklib.IAndroidTarget;
 import com.android.sdklib.SdkConstants;
 import com.android.sdklib.internal.project.ProjectProperties;
 import com.android.sdklib.internal.project.ProjectProperties.PropertyType;
-import com.android.sdkuilib.SdkTargetSelector;
+import com.android.sdkuilib.internal.widgets.SdkTargetSelector;
 
 import org.eclipse.core.filesystem.URIUtil;
 import org.eclipse.core.resources.IProject;
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newproject/NewTestProjectCreationPage.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newproject/NewTestProjectCreationPage.java
index d18c2ff..22c2749 100755
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newproject/NewTestProjectCreationPage.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newproject/NewTestProjectCreationPage.java
@@ -31,7 +31,7 @@ import com.android.ide.eclipse.adt.internal.wizards.newproject.NewProjectCreatio
 import com.android.ide.eclipse.adt.internal.wizards.newproject.NewProjectCreationPage.MainInfo;
 import com.android.sdklib.IAndroidTarget;
 import com.android.sdklib.SdkConstants;
-import com.android.sdkuilib.SdkTargetSelector;
+import com.android.sdkuilib.internal.widgets.SdkTargetSelector;
 
 import org.eclipse.core.filesystem.URIUtil;
 import org.eclipse.core.resources.IFile;