From bbdee05ca802744dc3a36cec513d94b4e827f6b5 Mon Sep 17 00:00:00 2001
From: "minkee.lee" <minkee.lee@samsung.com>
Date: Tue, 7 Oct 2014 14:23:23 +0900
Subject: [PATCH] Sensor: Modified template file for sensor options.

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

Change-Id: Idb16ab4256cdfa2008cb0afaf125628a9c130b4f
Signed-off-by: minkee.lee <minkee.lee@samsung.com>
---
 .../src/org/tizen/emulator/manager/mobile/vms/Launcher.java  |  5 +----
 .../org/tizen/emulator/manager/wearable/vms/Launcher.java    |  7 +------
 template/w-x86-standard-template.xml                         |  4 ++++
 template/w-x86-standard.xml                                  | 12 ++++++++----
 template/x86-standard-template.xml                           |  1 -
 template/x86-standard.xml                                    |  1 -
 6 files changed, 14 insertions(+), 16 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 11c86c6..547751c 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
@@ -85,7 +85,6 @@ public class Launcher implements ILauncher {
 	public static final String OPT_LIGHT = "light";
 	public static final String OPT_PROXI = "proxi";
 	public static final String OPT_HAPTIC = "haptic";
-	public static final String OPT_ROTATION = "rot";
 
 	public static Launcher getInstance() {
 		if (launcher == null) {
@@ -298,8 +297,6 @@ 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");
@@ -342,7 +339,7 @@ public class Launcher implements ILauncher {
 				cmd.add("virtio-touchscreen-pci");
 			}
 
-			// for sensor (enabled accel, geo, gyro, light, haptic, rot)
+			// for sensor (accel, geo, gyro, light, proxi, haptic)
 			OptionType sensor = property.getPropertyValue().getAdvancedOption(OPT_SENSOR);
 			if (sensor != null) {
 				cmd.add("-device");
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 f27f3da..75a0aff 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
@@ -82,7 +82,6 @@ public class Launcher implements ILauncher {
 	public static final String OPT_LIGHT = "light";
 	public static final String OPT_PROXI = "proxi";
 	public static final String OPT_HAPTIC = "haptic";
-	public static final String OPT_ROTATION = "rot";
 
 	public static Launcher getInstance() {
 		if (launcher == null) {
@@ -303,17 +302,13 @@ 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, geo, gyro, light, haptic, rot)
+			// for sensor (accel, geo, gyro, light, proxi, haptic)
 			OptionType sensor = property.getPropertyValue().getAdvancedOption(OPT_SENSOR);
 			if (sensor != null) {
 				cmd.add("-device");
diff --git a/template/w-x86-standard-template.xml b/template/w-x86-standard-template.xml
index 962519a..b586c2f 100644
--- a/template/w-x86-standard-template.xml
+++ b/template/w-x86-standard-template.xml
@@ -51,6 +51,10 @@
 		<item type="checkLabel" name="sensor" title="Sensor">
 			<item type="checkbox" name="accel" title="Accelerometer"/>
 			<item type="checkbox" name="gyro" title="Gyroscope"/>
+			<item type="checkbox" name="geo" title="Geo-magnetic"/>
+			<item type="checkbox" name="proxi" title="Proximity"/>
+			<item type="checkbox" name="light" title="Light"/>
+			<item type="checkbox" name="haptic" title="Haptic"/>
 		</item>
 		<item type="checkLabel" name="device" title="Device">
 			<item type="checkbox" name="camera" title="Camera"/>
diff --git a/template/w-x86-standard.xml b/template/w-x86-standard.xml
index b7cd520..429f2a5 100644
--- a/template/w-x86-standard.xml
+++ b/template/w-x86-standard.xml
@@ -33,9 +33,13 @@
     		<subOption name="charger" value="on"/>
     		<subOption name="usb" value="on"/>
     	</option>
-    	<option name="sensor">
-    		<subOption name="accel" value="on"/>
-    		<subOption name="gyro" value="on"/>
-    	</option>
+		<option name="sensor">
+			<subOption name="accel" value="on"/>
+			<subOption name="gyro" value="on"/>
+			<subOption name="geo" value="on"/>
+			<subOption name="light" value="on"/>
+			<subOption name="proxi" value="on"/>
+			<subOption name="haptic" value="on"/>
+		</option>
     </advancedOption>
 </EmulatorConfiguration>
diff --git a/template/x86-standard-template.xml b/template/x86-standard-template.xml
index 289eec6..e2ff132 100644
--- a/template/x86-standard-template.xml
+++ b/template/x86-standard-template.xml
@@ -53,7 +53,6 @@
 			<item type="checkbox" name="proxi" title="Proximity"/>
 			<item type="checkbox" name="light" title="Light"/>
 			<item type="checkbox" name="haptic" title="Haptic"/>
-			<item type="checkbox" name="rot" title="Rotation"/>
 		</item>
 		<item type="checkLabel" name="device" title="Device">
 	<!--		<item type="checkbox" name="nfc" title="NFC"/> -->
diff --git a/template/x86-standard.xml b/template/x86-standard.xml
index 9ba1c61..8dffd90 100644
--- a/template/x86-standard.xml
+++ b/template/x86-standard.xml
@@ -44,7 +44,6 @@
 			<subOption name="light" value="on"/>
 			<subOption name="proxi" value="on"/>
 			<subOption name="haptic" value="on"/>
-			<subOption name="rot" value="on"/>
 		</option>
 	</advancedOption>
 </EmulatorConfiguration>
-- 
2.7.4