aboutsummaryrefslogtreecommitdiffstats
path: root/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2
diff options
context:
space:
mode:
Diffstat (limited to 'eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2')
-rw-r--r--eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/RenderPreviewList.java5
-rw-r--r--eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/RenderPreviewManager.java5
2 files changed, 6 insertions, 4 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/RenderPreviewList.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/RenderPreviewList.java
index f5d3290..2bcdba3 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/RenderPreviewList.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/RenderPreviewList.java
@@ -36,6 +36,7 @@ import org.w3c.dom.Element;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.List;
/** A list of render previews */
@@ -85,7 +86,7 @@ class RenderPreviewList {
return new File(AdtUtils.getAbsolutePath(mProject).toFile(), PREVIEW_FILE_NAME);
}
- void load(List<Device> deviceList) throws IOException {
+ void load(Collection<Device> deviceList) throws IOException {
File file = getManualFile();
if (file.exists()) {
load(file, deviceList);
@@ -112,7 +113,7 @@ class RenderPreviewList {
}
}
- void load(File file, List<Device> deviceList) throws IOException {
+ void load(File file, Collection<Device> deviceList) throws IOException {
mList.clear();
String xml = Files.toString(file, Charsets.UTF_8);
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/RenderPreviewManager.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/RenderPreviewManager.java
index 4b0f484..9f6c3a2 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/RenderPreviewManager.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/RenderPreviewManager.java
@@ -72,6 +72,7 @@ import org.eclipse.ui.ide.IDE;
import java.io.IOException;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashSet;
@@ -964,7 +965,7 @@ public class RenderPreviewManager {
/** Similar to {@link #addDefaultPreviews()} but for screen sizes */
public void addScreenSizePreviews() {
ConfigurationChooser chooser = getChooser();
- List<Device> devices = chooser.getDeviceList();
+ Collection<Device> devices = chooser.getDevices();
Configuration configuration = chooser.getConfiguration();
boolean canScaleNinePatch = configuration.supports(Capability.FIXED_SCALABLE_NINE_PATCH);
@@ -1122,7 +1123,7 @@ public class RenderPreviewManager {
}
try {
- mManualList.load(getChooser().getDeviceList());
+ mManualList.load(getChooser().getDevices());
mPreviews = mManualList.createPreviews(mCanvas);
} catch (IOException e) {
AdtPlugin.log(e, null);