sensor: launch param is changed & remove binary

- mobile: removed rotation vector sensor
- wearable: same sensor supports as mobile profile

Change-Id: I70dd6164eef5c430131214023636f89898cf8aca
Signed-off-by: Jinhyung Choi <jinhyung2.choi@samsung.com>

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 1576502..11c86c6 100644 (file)
--- 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
@@ -298,6 +298,8 @@ public class Launcher implements ILauncher {
                        cmd.add("-device");
                        cmd.add("maru-brightness");
 
+                       cmd.add("virtio-sensor-pci,sensors=accel&geo&gyro&light&proxi&haptic");
+
                        // for vmodem
                        cmd.add("-device");
                        cmd.add("virtio-vmodem-pci");
@@ -382,12 +384,6 @@ public class Launcher implements ILauncher {
                                        }
                                        sb.append("haptic");
                                }
-                               if (checkOnOff(property.getPropertyValue().getAdvancedOptionSubValue(OPT_SENSOR, OPT_ROTATION))) {
-                                       if(!sb.toString().isEmpty()) {
-                                               sb.append("&");
-                                       }
-                                       sb.append("rot");
-                               }
 
                                if (sb.toString().isEmpty()) {
                                        cmd.add("virtio-sensor-pci");

diff --git a/plugin-project/wearable-plugin/em-plugin.jar b/plugin-project/wearable-plugin/em-plugin.jar
deleted file mode 100644 (file)
index 05f210d..0000000
Binary files a/plugin-project/wearable-plugin/em-plugin.jar and /dev/null differ

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 aecdace..f27f3da 100644 (file)
--- 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
@@ -286,7 +286,7 @@ public class Launcher implements ILauncher {
                                cmd.add("-device");
                                cmd.add("virtio-hwkey-pci");
                        }
-                       
+
                        // for codec
                        if (checkOnOff(property.getPropertyValue().getAdvancedOptionValue(OPT_CODEC))) {
                                cmd.add("-device");
@@ -303,13 +303,17 @@ public class Launcher implements ILauncher {
                                cmd.add("maru-camera");
                        }
 
+                       // for sensor
+                       cmd.add("-device");
+                       cmd.add("virtio-sensor-pci,sensors=accel&geo&gyro&light&proxi&haptic");
+
                        // for battery
                        if (checkOnOff(property.getPropertyValue().getAdvancedOptionSubValue(OPT_DEVICE, OPT_BATTERY))) {
                                cmd.add("-device");
                                cmd.add("virtio-power-pci");
                        }
 
-                       // for sensor (enabled accel, gyro)
+                       // for sensor (enabled accel, geo, gyro, light, haptic, rot)
                        OptionType sensor = property.getPropertyValue().getAdvancedOption(OPT_SENSOR);
                        if (sensor != null) {
                                cmd.add("-device");
@@ -320,13 +324,37 @@ public class Launcher implements ILauncher {
                                                sb.append("&");
                                        }
                                        sb.append("accel");
-                               }                       
+                               }
+                               if (checkOnOff(property.getPropertyValue().getAdvancedOptionSubValue(OPT_SENSOR, OPT_GEO))) {
+                                       if(!sb.toString().isEmpty()) {
+                                               sb.append("&");
+                                       }
+                                       sb.append("geo");
+                               }
                                if (checkOnOff(property.getPropertyValue().getAdvancedOptionSubValue(OPT_SENSOR, OPT_GYRO))) {
                                        if(!sb.toString().isEmpty()) {
                                                sb.append("&");
                                        }
                                        sb.append("gyro");
                                }
+                               if (checkOnOff(property.getPropertyValue().getAdvancedOptionSubValue(OPT_SENSOR, OPT_LIGHT))) {
+                                       if(!sb.toString().isEmpty()) {
+                                               sb.append("&");
+                                       }
+                                       sb.append("light");
+                               }
+                               if (checkOnOff(property.getPropertyValue().getAdvancedOptionSubValue(OPT_SENSOR, OPT_PROXI))) {
+                                       if(!sb.toString().isEmpty()) {
+                                               sb.append("&");
+                                       }
+                                       sb.append("proxi");
+                               }
+                               if (checkOnOff(property.getPropertyValue().getAdvancedOptionSubValue(OPT_SENSOR, OPT_HAPTIC))) {
+                                       if(!sb.toString().isEmpty()) {
+                                               sb.append("&");
+                                       }
+                                       sb.append("haptic");
+                               }
 
                                if (sb.toString().isEmpty()) {
                                        cmd.add("virtio-sensor-pci");