cleanup phone/wear AVD logic, removed gpu option

Author: codeanticode

src/processing/mode/android/AVD.java

@@ -26,6 +26,7 @@
 import processing.app.Preferences;
 import processing.app.exec.LineProcessor;
 import processing.app.exec.StreamPump;
+import processing.app.ui.Toolkit;
 import processing.core.PApplet;
 
 import java.awt.Frame;
@@ -35,6 +36,9 @@
 
 
 public class AVD {
+  final static private int PHONE = 0;
+  final static private int WEAR = 1;
+  
   static private final String AVD_CREATE_TITLE =
     "Could not create the AVD";
 
@@ -79,10 +83,10 @@ public class AVD {
 
   protected String device;
   protected String skin;
+  protected int type;
 
   static ArrayList<String> avdList;
   static ArrayList<String> badList;
-//  static ArrayList<String> skinList;
 
   /** "system-images;android-25;google_apis;x86" */
   static ArrayList<String> wearImages;
@@ -91,20 +95,21 @@ public class AVD {
   private static Process process;
 
   /** Default virtual device used by Processing. */
-  static public final AVD mobileAVD =
+  static public final AVD phoneAVD =
     new AVD("processing-phone",
-            DEVICE_DEFINITION, DEVICE_SKIN);
+            DEVICE_DEFINITION, DEVICE_SKIN, PHONE);
 
   /** Default virtual wear device used by Processing. */
-  static public final AVD wearAVD =
+  static public final AVD watchAVD =
     new AVD("processing-watch",
-            DEVICE_WEAR_DEFINITION, DEVICE_WEAR_SKIN);
+            DEVICE_WEAR_DEFINITION, DEVICE_WEAR_SKIN, WEAR);
 
 
-  public AVD(final String name, final String device, final String skin) {
+  public AVD(final String name, final String device, final String skin, int type) {
     this.name = name;
     this.device = device;
     this.skin = skin;
+    this.type = type;
   }
 
 
@@ -194,32 +199,30 @@ protected boolean badness() {
 
 
   protected boolean hasImages(final AndroidSDK sdk) throws IOException {
-    if (phoneImages == null) {
-      phoneImages = new ArrayList<String>();
-      getImages(phoneImages, sdk, SysImageDownloader.SYSTEM_IMAGE_TAG);
+    if (type == PHONE) {
+      if (phoneImages == null) {
+        phoneImages = new ArrayList<String>();
+        getImages(phoneImages, sdk, SysImageDownloader.SYSTEM_IMAGE_TAG);
+      }
+      return !phoneImages.isEmpty();
+    } else {
+      if (wearImages == null) {
+        wearImages = new ArrayList<String>();
+        getImages(wearImages, sdk, SysImageDownloader.SYSTEM_IMAGE_WEAR_TAG);
+      }
+      return !wearImages.isEmpty();      
     }
-    return !phoneImages.isEmpty();
   }
 
 
   protected void refreshImages(final AndroidSDK sdk) throws IOException {
-    phoneImages = new ArrayList<String>();
-    getImages(phoneImages, sdk, SysImageDownloader.SYSTEM_IMAGE_TAG);
-  } 
-  
-  
-  protected boolean hasWearImages(final AndroidSDK sdk) throws IOException {
-    if (wearImages == null) {
+    if (type == PHONE) {
+      phoneImages = new ArrayList<String>();
+      getImages(phoneImages, sdk, SysImageDownloader.SYSTEM_IMAGE_TAG);
+    } else {
       wearImages = new ArrayList<String>();
       getImages(wearImages, sdk, SysImageDownloader.SYSTEM_IMAGE_WEAR_TAG);
     }
-    return !wearImages.isEmpty();
-  }  
-  
-
-  protected void refreshWearImages(final AndroidSDK sdk) throws IOException {
-    wearImages = new ArrayList<String>();
-    getImages(wearImages, sdk, SysImageDownloader.SYSTEM_IMAGE_WEAR_TAG);
   } 
 
 
@@ -273,7 +276,7 @@ protected String getSdkId() throws IOException {
     if (Preferences.get("android.system.image.type") == null)
       Preferences.set("android.system.image.type", "x86"); // Prefer x86
 
-    if (this.name.contains("phone")) {
+    if (type == PHONE) {
       for (String image : phoneImages) {
         if (image.contains(Preferences.get("android.system.image.type")))
           return image;
@@ -384,45 +387,25 @@ static public String getPort(boolean wear) {
 
   static public boolean ensureProperAVD(final Frame window, final AndroidMode mode, 
       final AndroidSDK sdk, boolean wear) {
-    try {      
-      if (wear) {
-        if (wearAVD.exists(sdk)) {
-          return true;
-        }
-        if (wearAVD.badness()) {
-          AndroidUtil.showMessage(AVD_LOAD_TITLE, AVD_LOAD_MESSAGE);
-          return false;
-        }
-        if (!wearAVD.hasWearImages(sdk)) {
-          boolean res = AndroidSDK.locateSysImage(window, mode, true);
-          if (!res) {
-            return false;
-          } else {
-            wearAVD.refreshWearImages(sdk);
-          }
-        }
-        if (wearAVD.create(sdk)) {
-          return true;
-        }
-      } else {
-        if (mobileAVD.exists(sdk)) {
-          return true;
-        }
-        if (mobileAVD.badness()) {
-          AndroidUtil.showMessage(AVD_LOAD_TITLE, AVD_LOAD_MESSAGE);
+    try {
+      AVD avd = wear ? watchAVD : phoneAVD;
+      if (avd.exists(sdk)) {
+        return true;
+      }
+      if (avd.badness()) {
+        AndroidUtil.showMessage(AVD_LOAD_TITLE, AVD_LOAD_MESSAGE);
+        return false;
+      }
+      if (!avd.hasImages(sdk)) {
+        boolean res = AndroidSDK.locateSysImage(window, mode, wear);
+        if (!res) {
           return false;
+        } else {
+          avd.refreshImages(sdk);
         }
-        if (!mobileAVD.hasImages(sdk)) {
-          boolean res = AndroidSDK.locateSysImage(window, mode, false);
-          if (!res) {
-            return false;
-          } else {
-            mobileAVD.refreshImages(sdk);
-          }
-        }
-        if (mobileAVD.create(sdk)) {
-          return true;
-        }
+      }
+      if (avd.create(sdk)) {
+        return true;
       }
     } catch (final Exception e) {
       e.printStackTrace();

src/processing/mode/android/AndroidMode.java

@@ -298,7 +298,7 @@ public void handleRunEmulator(Sketch sketch, AndroidEditor editor,
     }
 
     int comp = build.getAppComponent();
-    Future<Device> emu = Devices.getInstance().getEmulator(sdk.getToolsFolder(), build.isWear(), build.usesOpenGL());
+    Future<Device> emu = Devices.getInstance().getEmulator(sdk.getToolsFolder(), build.isWear());
     runner = new AndroidRunner(build, listener);
     runner.launch(emu, comp, true);
   }

src/processing/mode/android/Commander.java

@@ -239,7 +239,7 @@ private void execute() {
         if (task == RUN) {
           AndroidRunner runner = new AndroidRunner(build, this);
           runner.launch(runOnEmu ?
-              Devices.getInstance().getEmulator(androidMode.getSDK().getToolsFolder(), build.isWear(), build.usesOpenGL()) :
+              Devices.getInstance().getEmulator(androidMode.getSDK().getToolsFolder(), build.isWear()) :
               Devices.getInstance().getHardware(), build.getAppComponent(), runOnEmu);
         }