summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--android/src/org/jetbrains/android/sdk/StudioEmbeddedRenderTarget.java3
-rw-r--r--designer/src/com/android/tools/idea/common/editor/DesignerEditorPanel.java2
-rw-r--r--layoutlib/src/com/android/layoutlib/NativeCrashHandling.java2
3 files changed, 3 insertions, 4 deletions
diff --git a/android/src/org/jetbrains/android/sdk/StudioEmbeddedRenderTarget.java b/android/src/org/jetbrains/android/sdk/StudioEmbeddedRenderTarget.java
index 8e93ea8e42f..b731605b085 100644
--- a/android/src/org/jetbrains/android/sdk/StudioEmbeddedRenderTarget.java
+++ b/android/src/org/jetbrains/android/sdk/StudioEmbeddedRenderTarget.java
@@ -16,7 +16,6 @@
package org.jetbrains.android.sdk;
import com.android.SdkConstants;
-import com.android.internal.util.Preconditions;
import com.android.sdklib.AndroidVersion;
import com.android.sdklib.BuildToolInfo;
import com.android.sdklib.IAndroidTarget;
@@ -25,6 +24,7 @@ import com.android.sdklib.repository.targets.PlatformTarget;
import com.android.tools.idea.rendering.multi.CompatibilityRenderTarget;
import com.android.tools.idea.util.StudioPathManager;
import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.PathManager;
@@ -34,7 +34,6 @@ import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VfsUtilCore;
import com.intellij.openapi.vfs.VirtualFile;
import java.io.File;
-import java.nio.file.FileSystems;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.List;
diff --git a/designer/src/com/android/tools/idea/common/editor/DesignerEditorPanel.java b/designer/src/com/android/tools/idea/common/editor/DesignerEditorPanel.java
index 6132862e129..166d3240474 100644
--- a/designer/src/com/android/tools/idea/common/editor/DesignerEditorPanel.java
+++ b/designer/src/com/android/tools/idea/common/editor/DesignerEditorPanel.java
@@ -16,7 +16,7 @@
package com.android.tools.idea.common.editor;
import com.android.annotations.concurrency.UiThread;
-import com.android.layoutlib.bridge.Bridge;
+import com.android.ide.common.rendering.api.Bridge;
import com.android.tools.adtui.common.AdtPrimaryPanel;
import com.android.tools.adtui.workbench.ToolWindowDefinition;
import com.android.tools.adtui.workbench.WorkBench;
diff --git a/layoutlib/src/com/android/layoutlib/NativeCrashHandling.java b/layoutlib/src/com/android/layoutlib/NativeCrashHandling.java
index fd948248849..c49fe0129f3 100644
--- a/layoutlib/src/com/android/layoutlib/NativeCrashHandling.java
+++ b/layoutlib/src/com/android/layoutlib/NativeCrashHandling.java
@@ -15,7 +15,7 @@
*/
package com.android.layoutlib;
-import com.android.layoutlib.bridge.Bridge;
+import com.android.ide.common.rendering.api.Bridge;
import com.intellij.internal.statistic.analytics.StudioCrashDetails;
import com.intellij.internal.statistic.analytics.StudioCrashDetection;
import com.intellij.openapi.components.BaseComponent;