Add new AVD creation and edit dialog

Take advantage of the new device specifications and provide a much
simplified AVD creation dialog, while retaining the old dialog for use
with AVDs created prior to this.

Change-Id: I2ab3613d6a1b58a96c330dc1d8c1df36afc88058

2 files changed, 16 insertions, 12 deletions

diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/devices/DeviceManager.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/devices/DeviceManager.java
index 238a176..c203231 100644
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/devices/DeviceManager.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/devices/DeviceManager.java
@@ -305,17 +305,6 @@ public class DeviceManager {
                 Integer.toString(hw.getScreen().getPixelDensity().getDpiValue()));
         props.put("hw.sensors.proximity",
                 getBooleanVal(sensors.contains(Sensor.PROXIMITY_SENSOR)));
-
-        for (Camera c : hw.getCameras()) {
-            String prop;
-            if (c.getLocation().equals(CameraLocation.FRONT)) {
-                prop = "hw.camera.front";
-            } else {
-                prop = "hw.camera.back";
-            }
-            props.put(prop, "emulated");
-        }
-
         return props;
     }
 
@@ -333,7 +322,7 @@ public class DeviceManager {
                 props.put("hw.keyboard.lid", getBooleanVal(true));
             }
         }
-        return getHardwareProperties(d.getDefaultState());
+        return props;
     }
 
     /**
diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/avd/AvdManager.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/avd/AvdManager.java
index 46d3124..091dc0b 100644
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/avd/AvdManager.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/avd/AvdManager.java
@@ -152,6 +152,21 @@ public class AvdManager {
     public final static String AVD_INI_SNAPSHOT_PRESENT = "snapshot.present"; //$NON-NLS-1$
 
     /**
+     * AVD/config.ini key name representing whether hardware OpenGLES emulation is enabled
+     */
+    public final static String AVD_INI_GPU_EMULATION = "hw.gpu.enabled"; //$NON-NLS-1$
+
+    /**
+     * AVD/config.ini key name representing how to emulate the front facing camera
+     */
+    public final static String AVD_INI_CAMERA_FRONT = "hw.camera.front"; //$NON-NLS-1$
+
+    /**
+     * AVD/config.ini key name representing how to emulate the rear facing camera
+     */
+    public final static String AVD_INI_CAMERA_BACK = "hw.camera.back"; //$NON-NLS-1$
+
+    /**
      * Pattern to match pixel-sized skin "names", e.g. "320x480".
      */
     public final static Pattern NUMERIC_SKIN_SIZE = Pattern.compile("([0-9]{2,})x([0-9]{2,})"); //$NON-NLS-1$