Avd Creation Dialog: Enable sdcard if user asks for it.

Change-Id: Ia5a57139cf76cec559c557011a2acee2af58457a

2 files changed, 59 insertions, 14 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 b2abb0f..27feb00 100644
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/devices/DeviceManager.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/devices/DeviceManager.java
@@ -341,20 +341,28 @@ public class DeviceManager {
     public static Map<String, String> getHardwareProperties(State s) {
         Hardware hw = s.getHardware();
         Map<String, String> props = new HashMap<String, String>();
-        props.put("hw.mainKeys", getBooleanVal(hw.getButtonType().equals(ButtonType.HARD)));
-        props.put("hw.trackBall", getBooleanVal(hw.getNav().equals(Navigation.TRACKBALL)));
-        props.put("hw.keyboard", getBooleanVal(hw.getKeyboard().equals(Keyboard.QWERTY)));
-        props.put("hw.dPad", getBooleanVal(hw.getNav().equals(Navigation.DPAD)));
+        props.put(HardwareProperties.HW_MAINKEYS,
+                getBooleanVal(hw.getButtonType().equals(ButtonType.HARD)));
+        props.put(HardwareProperties.HW_TRACKBALL,
+                getBooleanVal(hw.getNav().equals(Navigation.TRACKBALL)));
+        props.put(HardwareProperties.HW_KEYBOARD,
+                getBooleanVal(hw.getKeyboard().equals(Keyboard.QWERTY)));
+        props.put(HardwareProperties.HW_DPAD,
+                getBooleanVal(hw.getNav().equals(Navigation.DPAD)));
+
         Set<Sensor> sensors = hw.getSensors();
-        props.put("hw.gps", getBooleanVal(sensors.contains(Sensor.GPS)));
-        props.put("hw.battery", getBooleanVal(hw.getChargeType().equals(PowerType.BATTERY)));
-        props.put("hw.accelerometer", getBooleanVal(sensors.contains(Sensor.ACCELEROMETER)));
-        props.put("hw.sensors.orientation", getBooleanVal(sensors.contains(Sensor.GYROSCOPE)));
-        props.put("hw.audioInput", getBooleanVal(hw.hasMic()));
-        props.put("hw.sdCard", getBooleanVal(hw.getRemovableStorage().size() > 0));
-        props.put("hw.lcd.density",
+        props.put(HardwareProperties.HW_GPS, getBooleanVal(sensors.contains(Sensor.GPS)));
+        props.put(HardwareProperties.HW_BATTERY,
+                getBooleanVal(hw.getChargeType().equals(PowerType.BATTERY)));
+        props.put(HardwareProperties.HW_ACCELEROMETER,
+                getBooleanVal(sensors.contains(Sensor.ACCELEROMETER)));
+        props.put(HardwareProperties.HW_ORIENTATION_SENSOR,
+                getBooleanVal(sensors.contains(Sensor.GYROSCOPE)));
+        props.put(HardwareProperties.HW_AUDIO_INPUT, getBooleanVal(hw.hasMic()));
+        props.put(HardwareProperties.HW_SDCARD, getBooleanVal(hw.getRemovableStorage().size() > 0));
+        props.put(HardwareProperties.HW_LCD_DENSITY,
                 Integer.toString(hw.getScreen().getPixelDensity().getDpiValue()));
-        props.put("hw.sensors.proximity",
+        props.put(HardwareProperties.HW_PROXIMITY_SENSOR,
                 getBooleanVal(sensors.contains(Sensor.PROXIMITY_SENSOR)));
         return props;
     }
diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/avd/HardwareProperties.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/avd/HardwareProperties.java
index 33156b4..02241ef 100644
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/avd/HardwareProperties.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/avd/HardwareProperties.java
@@ -30,6 +30,43 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 public class HardwareProperties {
+    /** AVD/config.ini key for whether hardware buttons are present. */
+    public static final String HW_MAINKEYS = "hw.mainKeys";
+
+    /** AVD/config.ini key indicating whether trackball is present. */
+    public static final String HW_TRACKBALL = "hw.trackBall";
+
+    /** AVD/config.ini key indicating whether qwerty keyboard is present. */
+    public static final String HW_KEYBOARD = "hw.keyboard";
+
+    /** AVD/config.ini key indicating whether dpad is present. */
+    public static final String HW_DPAD = "hw.dPad";
+
+    /** AVD/config.ini key indicating whether gps is present. */
+    public static final String HW_GPS = "hw.gps";
+
+    /** AVD/config.ini key indicating whether the device is running on battery. */
+    public static final String HW_BATTERY = "hw.battery";
+
+    /** AVD/config.ini key indicating whether accelerometer is present. */
+    public static final String HW_ACCELEROMETER = "hw.accelerometer";
+
+    /** AVD/config.ini key indicating whether gyroscope is present. */
+    public static final String HW_ORIENTATION_SENSOR = "hw.sensors.orientation";
+
+    /** AVD/config.ini key indicating whether h/w mic is present. */
+    public static final String HW_AUDIO_INPUT = "hw.audioInput";
+
+    /** AVD/config.ini key indicating whether sdcard is present. */
+    public static final String HW_SDCARD = "hw.sdCard";
+
+    /** AVD/config.ini key for LCD density. */
+    public static final String HW_LCD_DENSITY = "hw.lcd.density";
+
+    /** AVD/config.ini key indicating whether proximity sensor present. */
+    public static final String HW_PROXIMITY_SENSOR = "hw.sensors.proximity";
+
+
     private final static Pattern PATTERN_PROP = Pattern.compile(
     "^([a-zA-Z0-9._-]+)\\s*=\\s*(.*)\\s*$");
 
@@ -46,8 +83,8 @@ public class HardwareProperties {
     /** Comma-separate values for a property of type "enum" */
     private final static String HW_PROP_ENUM = "enum";              //$NON-NLS-1$
 
-    private final static String BOOLEAN_YES = "yes";
-    private final static String BOOLEAN_NO = "no";
+    public final static String BOOLEAN_YES = "yes";
+    public final static String BOOLEAN_NO = "no";
     public final static String[] BOOLEAN_VALUES = new String[] { BOOLEAN_YES, BOOLEAN_NO };
     public final static Pattern DISKSIZE_PATTERN = Pattern.compile("\\d+[MK]B"); //$NON-NLS-1$