From d9c5e790810ee59b641c6d6c712d2f2cc5c2a3c3 Mon Sep 17 00:00:00 2001
From: benfry <fry@processing.org>
Date: Fri, 19 Feb 2010 19:48:08 +0000
Subject: [PATCH] remove donut references from the android tool

---
 .../processing/app/tools/android/Android.java |  3 ++-
 .../processing/app/tools/android/Device.java  | 22 +++++++++----------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/app/src/processing/app/tools/android/Android.java b/app/src/processing/app/tools/android/Android.java
index edd49a6d6..a6382da7e 100644
--- a/app/src/processing/app/tools/android/Android.java
+++ b/app/src/processing/app/tools/android/Android.java
@@ -491,7 +491,8 @@ public class Android implements Tool {
 
 
   public String getDefaultDevice() {
-    return Device.avdDonut.name;
+//    return Device.avdDonut.name;
+    return Device.avdEclair.name;
   }
 
 
diff --git a/app/src/processing/app/tools/android/Device.java b/app/src/processing/app/tools/android/Device.java
index 0782c4c95..2010d8168 100644
--- a/app/src/processing/app/tools/android/Device.java
+++ b/app/src/processing/app/tools/android/Device.java
@@ -46,10 +46,10 @@ public class Device {
    * a device like a T-Mobile G1 or myTouch 3G. Uses Android 1.6 (Donut) APIs,
    * and the screen is 480x320 pixels, or HVGA (Half VGA).
    */
-  static Device avdDonut =
-    // Using the generic AVD causes a prompt to show up on the console,
-    // so using the Google version instead which doesn't ask for a profile.
-    new Device("Processing-Donut", "Google Inc.:Google APIs:4", 480, 320);
+//  static Device avdDonut =
+//    // Using the generic AVD causes a prompt to show up on the console,
+//    // so using the Google version instead which doesn't ask for a profile.
+//    new Device("Processing-Donut", "Google Inc.:Google APIs:4", 480, 320);
 
   /**
    * Default virtual device used by Processing, designed to be similar to
@@ -84,13 +84,13 @@ public class Device {
 
   static boolean checkDefaults() {
     try {
-      if (!avdDonut.exists()) {
-        if (!avdDonut.create()) {
-          Base.showWarning("Android Error",
-                           "An error occurred while running “android create avd”\n" +
-                           "to set up the default Android emulator.", null);
-        }
-      }
+//      if (!avdDonut.exists()) {
+//        if (!avdDonut.create()) {
+//          Base.showWarning("Android Error",
+//                           "An error occurred while running “android create avd”\n" +
+//                           "to set up the default Android emulator.", null);
+//        }
+//      }
       if (!avdEclair.exists()) {
         if (!avdEclair.create()) {
           Base.showWarning("Android Error", AVD_CREATE_ERROR, null);