Resolution: Added experimental resolution.

- Additional resolutions are enabled if emulator-manager runs as experimental mode.

Change-Id: Id2e8a8f095af4028acc621a44d3e8dfeff01567c
Signed-off-by: minkee.lee <minkee.lee@samsung.com>

diff --git a/common-project/src/org/tizen/emulator/manager/ui/detail/item/OptionType.java b/common-project/src/org/tizen/emulator/manager/ui/detail/item/OptionType.java
index d3a21c8..2a5d042 100644 (file)
--- a/common-project/src/org/tizen/emulator/manager/ui/detail/item/OptionType.java
+++ b/common-project/src/org/tizen/emulator/manager/ui/detail/item/OptionType.java
@@ -42,7 +42,8 @@ public enum OptionType {
        DEFAULT_IF_EMPTY("defaultIfEmpty"),
        SPREAD_ON_START("spreadOnStart"),
        PROFILE("profile"),
-       MODIFY_ENABLE("modifyEnable")
+       MODIFY_ENABLE("modifyEnable"),
+       EXPERIMENTAL("experimental")
        ;
 
        public static final String VALUE_TRUE = "true";

diff --git a/common-project/src/org/tizen/emulator/manager/ui/detail/item/property/ResolutionSubViewItem.java b/common-project/src/org/tizen/emulator/manager/ui/detail/item/property/ResolutionSubViewItem.java
index 06efd38..687d7ea 100644 (file)
--- a/common-project/src/org/tizen/emulator/manager/ui/detail/item/property/ResolutionSubViewItem.java
+++ b/common-project/src/org/tizen/emulator/manager/ui/detail/item/property/ResolutionSubViewItem.java
@@ -37,7 +37,10 @@ import java.util.List;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.swt.widgets.Composite;
+import org.tizen.emulator.manager.EmulatorManager;
+import org.tizen.emulator.manager.EmulatorManager.ManagerModeType;
 import org.tizen.emulator.manager.logging.EMLogger;
+import org.tizen.emulator.manager.ui.detail.item.OptionType;
 import org.tizen.emulator.manager.ui.detail.item.template.ComboSubViewItem;
 import org.tizen.emulator.manager.ui.detail.item.template.LabelViewItem;
 import org.tizen.emulator.manager.vms.RESOLUTION;
@@ -65,7 +68,13 @@ public class ResolutionSubViewItem extends ComboSubViewItem {
        protected void parseOption(List<Option> optionList) {
                super.parseOption(optionList);
                resList = new ArrayList<RESOLUTION>();
+
                for (Option option : optionList) {
+                       if (EmulatorManager.getManagerMode() == ManagerModeType.PUBLIC_MODE) {
+                               if (option.getName().equals(OptionType.EXPERIMENTAL.getName())) {
+                                       continue;
+                               }
+                       }
                        String[] split = option.getValue().split(",");
                        if (split.length == 4) { // name, width, height, dpi
                                RESOLUTION resolution = null;

diff --git a/template/x86-standard-template.xml b/template/x86-standard-template.xml
index 50c4826..e650f2c 100644 (file)
--- a/template/x86-standard-template.xml
+++ b/template/x86-standard-template.xml
@@ -14,15 +14,16 @@
                <item type="label" name="display" title="Display">
                        <item type="combo" name="resolution" title="Resolution">
                                <!-- name, width, height, dpi -->
-<!--                           <option name="hvga"> HVGA,320,480,160 </option> -->
+                               <option name="experimental"> ,320,320,316 </option>
+                               <option name="experimental"> HVGA,320,480,160 </option>
                                <option name="wvga"> WVGA,480,800,233 </option>
 <!--                           <option name="wsvga"> WSVGA,600,1024,207 </option> -->
+                               <option name="experimental"> WSVGA,600,1024,207 </option>
                                <option name="qhd"> qHD,540,960,220 </option>
                                <option name="hd"> HD,720,1280,306 </option>
-<!--                           <option name="wxga"> WXGA,1280,800,300 </option> -->
-<!--                           <option name="hd1080"> HD1080,1920,1080,314 </option> -->
-<!--                           <option name="wqxga"> WQXGA,2560,1600,301 </option> -->
-<!--                           <option name="fullhd"> FULLHD,1080,1920,314 </option> -->
+                               <option name="experimental"> WXGA,1280,800,300 </option>
+                               <option name="experimental"> WQXGA,2560,1600,301 </option>
+                               <option name="experimental"> FULLHD,1080,1920,314 </option>
                        </item>
                        <item type="spinner" name="dpi" title="Density"/>
                        <item type="combo" name="skin" title="Skin"/>