diff options
Diffstat (limited to 'eclipse')
3 files changed, 21 insertions, 19 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/ConfigurationChooser.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/ConfigurationChooser.java index 750c192..a81ddc8 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/ConfigurationChooser.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/ConfigurationChooser.java @@ -69,7 +69,7 @@ import com.android.sdklib.AndroidVersion; import com.android.sdklib.IAndroidTarget; import com.android.sdklib.devices.Device; import com.android.sdklib.devices.DeviceManager; -import com.android.sdklib.devices.DeviceManager.DevicesChangeListener; +import com.android.sdklib.devices.DeviceManager.DevicesChangedListener; import com.android.sdklib.devices.State; import com.android.utils.Pair; import com.google.common.base.Objects; @@ -109,7 +109,7 @@ import java.util.SortedSet; * {@link Configuration} by configuring various constraints. */ public class ConfigurationChooser extends Composite - implements DevicesChangeListener, DisposeListener { + implements DevicesChangedListener, DisposeListener { private static final String ICON_SQUARE = "square"; //$NON-NLS-1$ private static final String ICON_LANDSCAPE = "landscape"; //$NON-NLS-1$ private static final String ICON_PORTRAIT = "portrait"; //$NON-NLS-1$ @@ -858,11 +858,11 @@ public class ConfigurationChooser extends Composite private void initDevices() { final Sdk sdk = Sdk.getCurrent(); if (sdk != null) { - mDeviceList = sdk.getDevices(); DeviceManager manager = sdk.getDeviceManager(); // This method can be called more than once, so avoid duplicate entries manager.unregisterListener(this); manager.registerListener(this); + mDeviceList = manager.getDevices(DeviceManager.ALL_DEVICES); } else { mDeviceList = new ArrayList<Device>(); } @@ -1353,12 +1353,16 @@ public class ConfigurationChooser extends Composite } } - // ---- Implements DevicesChangeListener ---- + // ---- Implements DevicesChangedListener ---- @Override - public void onDevicesChange() { + public void onDevicesChanged() { final Sdk sdk = Sdk.getCurrent(); - mDeviceList = sdk.getDevices(); + if (sdk != null) { + mDeviceList = sdk.getDeviceManager().getDevices(DeviceManager.ALL_DEVICES); + } else { + mDeviceList = new ArrayList<Device>(); + } } // ---- Reacting to UI changes ---- diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/Sdk.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/Sdk.java index d9020f8..5d9c0ef 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/Sdk.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/Sdk.java @@ -45,7 +45,6 @@ import com.android.prefs.AndroidLocation.AndroidLocationException; import com.android.sdklib.AndroidVersion; import com.android.sdklib.IAndroidTarget; import com.android.sdklib.SdkManager; -import com.android.sdklib.devices.Device; import com.android.sdklib.devices.DeviceManager; import com.android.sdklib.internal.avd.AvdManager; import com.android.sdklib.internal.project.ProjectProperties; @@ -702,12 +701,6 @@ public final class Sdk { return mDeviceManager; } - /** Returns the devices provided by the SDK, including user created devices */ - @NonNull - public List<Device> getDevices() { - return mDeviceManager.getDevices(getSdkLocation()); - } - /** * Returns a list of {@link ProjectState} representing projects depending, directly or * indirectly on a given library project. @@ -784,10 +777,11 @@ public final class Sdk { IResourceDelta.CHANGED | IResourceDelta.ADDED | IResourceDelta.REMOVED); // pre-compute some paths - mDocBaseUrl = getDocumentationBaseUrl(mManager.getLocation() + + mDocBaseUrl = getDocumentationBaseUrl(manager.getLocation() + SdkConstants.OS_SDK_DOCS_FOLDER); - mDeviceManager = new DeviceManager(AdtPlugin.getDefault()); + mDeviceManager = DeviceManager.createInstance(manager.getLocation(), + AdtPlugin.getDefault()); // update whatever ProjectState is already present with new IAndroidTarget objects. synchronized (LOCK) { diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/layout/configuration/ConfigurationTest.java b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/layout/configuration/ConfigurationTest.java index 726d9c9..d4062ab 100644 --- a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/layout/configuration/ConfigurationTest.java +++ b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/layout/configuration/ConfigurationTest.java @@ -49,8 +49,10 @@ public class ConfigurationTest extends TestCase { configuration.setTheme("@style/Theme"); assertEquals("@style/Theme", configuration.getTheme()); - DeviceManager deviceManager = new DeviceManager(new StdLogger(StdLogger.Level.VERBOSE)); - List<Device> devices = deviceManager.getDefaultDevices(); + DeviceManager deviceManager = DeviceManager.createInstance( + null /*osSdkPath*/, + new StdLogger(StdLogger.Level.VERBOSE)); + List<Device> devices = deviceManager.getDevices(DeviceManager.DEFAULT_DEVICES); assertNotNull(devices); assertTrue(devices.size() > 0); configuration.setDevice(devices.get(0), false); @@ -107,8 +109,10 @@ public class ConfigurationTest extends TestCase { assertNotNull(configuration); configuration.setTheme("@style/Theme"); assertEquals("@style/Theme", configuration.getTheme()); - DeviceManager deviceManager = new DeviceManager(new StdLogger(StdLogger.Level.VERBOSE)); - List<Device> devices = deviceManager.getDefaultDevices(); + DeviceManager deviceManager = DeviceManager.createInstance( + null /*osSdkPath*/, + new StdLogger(StdLogger.Level.VERBOSE)); + List<Device> devices = deviceManager.getDevices(DeviceManager.DEFAULT_DEVICES); assertNotNull(devices); assertTrue(devices.size() > 0); configuration.setDevice(devices.get(0), false); |