copy device art to SDK folder if not present

Author: codeanticode

mode/src/processing/mode/android/AVD.java

@@ -24,7 +24,6 @@
 import processing.app.Base;
 import processing.app.Platform;
 import processing.app.Preferences;
-import processing.app.exec.LineProcessor;
 import processing.app.exec.StreamPump;
 import processing.core.PApplet;
 
@@ -353,6 +352,16 @@ protected String getSdkId() throws IOException {
     return "null";
   }
 
+  protected void copyDeviceSkins(final AndroidSDK sdk, final AndroidMode mode) {
+    File skinsFolder = new File(sdk.getFolder(), "skins");
+    if (!skinsFolder.exists()) {
+      // The skins in this folder come from Android Studio, on Mac they are in the folder:
+      // /Applications/Android Studio.app/Contents/plugins/android/resources/device-art-resources
+      // Apparently the skins are not available as a SDK download.
+      File artFolder = new File(mode.getResourcesFolder(), "device-art-resources");
+      AndroidUtil.copyDir(artFolder, skinsFolder);
+    }
+  }
 
   protected boolean create(final AndroidSDK sdk) throws IOException {
     File sketchbookFolder = processing.app.Base.getSketchbookFolder();
@@ -379,9 +388,8 @@ protected boolean create(final AndroidSDK sdk) throws IOException {
     }
 
     // avdmanager create avd -n "Wear-Processing-0254" -k "system-images;android-25;google_apis;x86" -c 64M
-
     // Set the list to null so that exists() will check again
-    avdList = null;
+//    avdList = null;
 
     Map<String, String> env = pb.environment();
     env.clear();
@@ -392,13 +400,13 @@ protected boolean create(final AndroidSDK sdk) throws IOException {
       process = pb.start();
 
       // Passes 'no' to "Do you wish to create a custom hardware profile [no]"
-      OutputStream os = process.getOutputStream();
-      PrintWriter pw = new PrintWriter(new OutputStreamWriter(os));
-      pw.println("no");
-      pw.flush();
-      pw.close();
-      os.flush();
-      os.close();
+//      OutputStream os = process.getOutputStream();
+//      PrintWriter pw = new PrintWriter(new OutputStreamWriter(os));
+//      pw.println("no");
+//      pw.flush();
+//      pw.close();
+//      os.flush();
+//      os.close();
 
       StringWriter outWriter = new StringWriter();
       new StreamPump(process.getInputStream(), "out: ").addTarget(outWriter).start();
@@ -427,7 +435,6 @@ protected boolean create(final AndroidSDK sdk) throws IOException {
                                 AndroidMode.getTextString("android_avd.error.cannot_create_avd_body", AndroidBuild.TARGET_SDK));
       }
       System.err.println(outWriter.toString());
-      //System.err.println(createAvdResult);
     } catch (final InterruptedException ie) { 
       ie.printStackTrace(); 
     } finally {
@@ -463,6 +470,7 @@ static public boolean ensureProperAVD(final Frame window, final AndroidMode mode
           avd.refreshImages(sdk);
         }
       }
+      avd.copyDeviceSkins(sdk, mode);
       if (avd.create(sdk)) {
         return true;
       }

mode/src/processing/mode/android/AndroidMode.java

@@ -188,7 +188,12 @@ public void checkSDK(Editor editor) {
   public AndroidSDK getSDK() {
     return sdk;
   }
-  
+
+
+  public File getResourcesFolder() {
+    return new File(getFolder(), "resources");
+  }
+
 
   public String getModeJar() {
     String modePath = new File(getFolder(), "mode").getAbsolutePath();