Merge "Move the vector drawble conversion/preview library from asset lib to sdk-common" into studio-1.4-dev

3 files changed, 9 insertions, 8 deletions

diff --git a/android/src/com/android/tools/idea/npw/AssetStudioAssetGenerator.java b/android/src/com/android/tools/idea/npw/AssetStudioAssetGenerator.java
index 1c946a03419..1e79909637a 100644
--- a/android/src/com/android/tools/idea/npw/AssetStudioAssetGenerator.java
+++ b/android/src/com/android/tools/idea/npw/AssetStudioAssetGenerator.java
@@ -19,9 +19,10 @@ package com.android.tools.idea.npw;
 import com.android.SdkConstants;
 import com.android.annotations.VisibleForTesting;
 import com.android.assetstudiolib.*;
-import com.android.assetstudiolib.vectordrawable.Svg2Vector;
-import com.android.assetstudiolib.vectordrawable.VdOverrideInfo;
-import com.android.assetstudiolib.vectordrawable.VdPreview;
+import com.android.ide.common.util.AssetUtil;
+import com.android.ide.common.vectordrawable.Svg2Vector;
+import com.android.ide.common.vectordrawable.VdOverrideInfo;
+import com.android.ide.common.vectordrawable.VdPreview;
 import com.android.resources.Density;
 import com.android.tools.idea.rendering.ImageUtils;
 import com.android.tools.idea.wizard.template.TemplateWizardState;
@@ -455,7 +456,7 @@ public class AssetStudioAssetGenerator implements GraphicGeneratorContext {
 
         if (type.needsColors()) {
           Paint paint = myContext.getForegroundColor();
-          sourceImage = Util.filledImage(sourceImage, paint);
+          sourceImage = AssetUtil.filledImage(sourceImage, paint);
         }
         break;
       }
@@ -475,7 +476,7 @@ public class AssetStudioAssetGenerator implements GraphicGeneratorContext {
     }
 
     if (padding != 0) {
-      sourceImage = Util.paddedImage(sourceImage, padding);
+      sourceImage = AssetUtil.paddedImage(sourceImage, padding);
     }
 
     GraphicGenerator generator = null;
diff --git a/android/src/com/android/tools/idea/npw/IconPicker.java b/android/src/com/android/tools/idea/npw/IconPicker.java
index 813d5e4072c..2566d885329 100644
--- a/android/src/com/android/tools/idea/npw/IconPicker.java
+++ b/android/src/com/android/tools/idea/npw/IconPicker.java
@@ -18,7 +18,7 @@ package com.android.tools.idea.npw;
 import com.android.SdkConstants;
 import com.android.annotations.Nullable;
 import com.android.assetstudiolib.GraphicGenerator;
-import com.android.assetstudiolib.vectordrawable.VdIcon;
+import com.android.ide.common.vectordrawable.VdIcon;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.TreeMultimap;
 import com.intellij.openapi.diagnostic.Logger;
diff --git a/android/src/com/android/tools/idea/ui/VectorImageComponent.java b/android/src/com/android/tools/idea/ui/VectorImageComponent.java
index 4dc4093e9ca..9f2cc455a6f 100644
--- a/android/src/com/android/tools/idea/ui/VectorImageComponent.java
+++ b/android/src/com/android/tools/idea/ui/VectorImageComponent.java
@@ -15,7 +15,7 @@
  */
 package com.android.tools.idea.ui;
 
-import com.android.assetstudiolib.Util;
+import com.android.ide.common.util.AssetUtil;
 import com.intellij.util.ui.UIUtil;
 import org.jetbrains.annotations.NotNull;
 
@@ -67,6 +67,6 @@ public class VectorImageComponent extends ImageComponent {
     g.draw3DRect(0, 0, getWidth() - 1, getHeight() - 1, false);
 
     Rectangle rect = new Rectangle(0, 0, getWidth(), getHeight());
-    Util.drawCenterInside(g2d, image, rect);
+    AssetUtil.drawCenterInside(g2d, image, rect);
   }
 }