From 2a98eda2e1c5228b98747c02c2ee7d18ed4abbb4 Mon Sep 17 00:00:00 2001 From: "minkee.lee" Date: Fri, 16 Jan 2015 17:41:49 +0900 Subject: [PATCH] Option: Removed some VM options in UI.(Removed only in UI) - wearable : battery, USB, charger - mobile : battery, USB, charger, earjack. Change-Id: Ia478850df6ad13472eb85ad48a00372633e8145c Signed-off-by: minkee.lee --- .../src/org/tizen/emulator/manager/mobile/vms/Launcher.java | 13 ++++++++----- .../org/tizen/emulator/manager/wearable/vms/Launcher.java | 10 ++++++++-- template/w-x86-standard-template.xml | 10 +++++----- template/x86-standard-template.xml | 12 ++++++------ 4 files changed, 27 insertions(+), 18 deletions(-) diff --git a/plugin-project/mobile-plugin/src/org/tizen/emulator/manager/mobile/vms/Launcher.java b/plugin-project/mobile-plugin/src/org/tizen/emulator/manager/mobile/vms/Launcher.java index 6512f76..b222320 100644 --- a/plugin-project/mobile-plugin/src/org/tizen/emulator/manager/mobile/vms/Launcher.java +++ b/plugin-project/mobile-plugin/src/org/tizen/emulator/manager/mobile/vms/Launcher.java @@ -330,10 +330,12 @@ public class Launcher implements ILauncher { // } // for battery - if (checkOnOff(property.getPropertyValue().getAdvancedOptionSubValue(OPT_DEVICE, OPT_BATTERY))) { + cmd.add("-device"); + cmd.add("virtio-power-pci"); + /*if (checkOnOff(property.getPropertyValue().getAdvancedOptionSubValue(OPT_DEVICE, OPT_BATTERY))) { cmd.add("-device"); cmd.add("virtio-power-pci"); - } + }*/ // for camera if (checkOnOff(property.getPropertyValue().getAdvancedOptionSubValue(OPT_DEVICE, OPT_CAMERA))) { @@ -419,8 +421,9 @@ public class Launcher implements ILauncher { } // for jacks (enabled charger, earjack and usb) - // for sensor (enabled accel, geo, gyro, light and proxi) - OptionType jacks = property.getPropertyValue().getAdvancedOption(OPT_JACK); + cmd.add("-device"); + cmd.add("virtio-jack-pci,jacks=earjack&charger&usb"); + /* OptionType jacks = property.getPropertyValue().getAdvancedOption(OPT_JACK); if (jacks != null) { cmd.add("-device"); @@ -450,7 +453,7 @@ public class Launcher implements ILauncher { sb.insert(0, "virtio-jack-pci,jacks="); cmd.add(sb.toString()); } - } + } */ } /* append user added options if exists */ diff --git a/plugin-project/wearable-plugin/src/org/tizen/emulator/manager/wearable/vms/Launcher.java b/plugin-project/wearable-plugin/src/org/tizen/emulator/manager/wearable/vms/Launcher.java index 11a44f9..961beb1 100644 --- a/plugin-project/wearable-plugin/src/org/tizen/emulator/manager/wearable/vms/Launcher.java +++ b/plugin-project/wearable-plugin/src/org/tizen/emulator/manager/wearable/vms/Launcher.java @@ -313,10 +313,14 @@ public class Launcher implements ILauncher { } // for battery + cmd.add("-device"); + cmd.add("virtio-power-pci"); + /* if (checkOnOff(property.getPropertyValue().getAdvancedOptionSubValue(OPT_DEVICE, OPT_BATTERY))) { cmd.add("-device"); cmd.add("virtio-power-pci"); } + */ // for sensor (accel, geo, gyro, light, proxi, haptic, pressure, ultra violet, heart rate meter) OptionType sensor = property.getPropertyValue().getAdvancedOption(OPT_SENSOR); @@ -388,7 +392,9 @@ public class Launcher implements ILauncher { } // for jacks (enabled charger, and usb) - OptionType jacks = property.getPropertyValue().getAdvancedOption(OPT_JACK); + cmd.add("-device"); + cmd.add("virtio-jack-pci,jacks=charger&usb"); + /* OptionType jacks = property.getPropertyValue().getAdvancedOption(OPT_JACK); if (jacks != null) { cmd.add("-device"); @@ -412,7 +418,7 @@ public class Launcher implements ILauncher { sb.insert(0, "virtio-jack-pci,jacks="); cmd.add(sb.toString()); } - } + } */ cmd.add("-device"); diff --git a/template/w-x86-standard-template.xml b/template/w-x86-standard-template.xml index 15c50a1..44073a8 100644 --- a/template/w-x86-standard-template.xml +++ b/template/w-x86-standard-template.xml @@ -62,16 +62,16 @@ - + - - - - + + + + diff --git a/template/x86-standard-template.xml b/template/x86-standard-template.xml index 5cc89a1..81dea07 100644 --- a/template/x86-standard-template.xml +++ b/template/x86-standard-template.xml @@ -61,17 +61,17 @@ - + - - - - - + + + + + -- 2.7.4