Allow user control over whether a skin is displayed.

Change-Id: I07c8b468e9a2c900b7cadd04f256dc67128401f7

2 files changed, 21 insertions, 0 deletions

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 d2ba1b6..6b219d3 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
@@ -114,6 +114,12 @@ public class AvdManager {
      * If missing, use the {@link #AVD_INI_SKIN_PATH} key instead.
      */
     public final static String AVD_INI_SKIN_NAME = "skin.name"; //$NON-NLS-1$
+
+    /**
+     * AVD/config.ini key name representing whether a dynamic skin should be displayed.
+     */
+    public final static String AVD_INI_SKIN_DYNAMIC = "skin.dynamic"; //$NON-NLS-1$
+
     /**
      * AVD/config.ini key name representing the path to the sdcard file.
      * If missing, the default name "sdcard.img" will be used for the sdcard, if there's such
diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/widgets/AvdCreationDialog.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/widgets/AvdCreationDialog.java
index 75fe6b5..d78341b 100644
--- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/widgets/AvdCreationDialog.java
+++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/widgets/AvdCreationDialog.java
@@ -88,6 +88,8 @@ public class AvdCreationDialog extends GridDialog {
     private Combo mAbi;
 
     private Button mKeyboard;
+    private Button mSkin;
+
     private Combo mFrontCamera;
     private Combo mBackCamera;
 
@@ -253,6 +255,13 @@ public class AvdCreationDialog extends GridDialog {
         mKeyboard.setText("Hardware keyboard present");
 
         label = new Label(parent, SWT.NONE);
+        label.setText("Skin:");
+        mSkin = new Button(parent, SWT.CHECK);
+        mSkin.setSelection(true);
+        mSkin.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+        mSkin.setText("Display a skin with hardware controls");
+
+        label = new Label(parent, SWT.NONE);
         label.setText("Front Camera:");
         tooltip = "";
         label.setToolTipText(tooltip);
@@ -908,6 +917,10 @@ public class AvdCreationDialog extends GridDialog {
                 mKeyboard.getSelection() ?
                         HardwareProperties.BOOLEAN_YES : HardwareProperties.BOOLEAN_NO);
 
+        hwProps.put(AvdManager.AVD_INI_SKIN_DYNAMIC,
+                mSkin.getSelection() ?
+                        HardwareProperties.BOOLEAN_YES : HardwareProperties.BOOLEAN_NO);
+
         if (mFrontCamera.isEnabled()) {
             hwProps.put(AvdManager.AVD_INI_CAMERA_FRONT,
                     mFrontCamera.getText().toLowerCase());
@@ -1041,6 +1054,8 @@ public class AvdCreationDialog extends GridDialog {
 
             mKeyboard.setSelection(
                     props.get(HardwareProperties.HW_KEYBOARD) == HardwareProperties.BOOLEAN_YES);
+            mSkin.setSelection(
+                    props.get(AvdManager.AVD_INI_SKIN_DYNAMIC) == HardwareProperties.BOOLEAN_YES);
 
             String cameraFront = props.get(AvdManager.AVD_INI_CAMERA_FRONT);
             if (cameraFront != null) {