From 512bca8be3b40115d682a9a42d5e3ee219c9f4d8 Mon Sep 17 00:00:00 2001
From: "minkee.lee" <minkee.lee@samsung.com>
Date: Thu, 18 Sep 2014 18:28:52 +0900
Subject: [PATCH] Template: Changed template file name.

- x86-kiran -> x86-standard

Change-Id: I0c97b87257422123fa5eebe07ecd32eb097ce569
Signed-off-by: minkee.lee <minkee.lee@samsung.com>
---
 package/build.linux                                |  8 +--
 package/build.macos-64                             |  8 +--
 package/build.windows                              |  8 +--
 ...an-template.xml => w-x86-standard-template.xml} |  2 +-
 template/{w-x86-kiran.xml => w-x86-standard.xml}   |  0
 template/x86-kiran-template.xml                    | 82 ----------------------
 template/x86-kiran.xml                             | 50 -------------
 template/x86-standard-template.xml                 | 15 +++-
 template/x86-standard.xml                          | 82 +++++++++++-----------
 9 files changed, 67 insertions(+), 188 deletions(-)
 rename template/{w-x86-kiran-template.xml => w-x86-standard-template.xml} (99%)
 rename template/{w-x86-kiran.xml => w-x86-standard.xml} (100%)
 delete mode 100644 template/x86-kiran-template.xml
 delete mode 100644 template/x86-kiran.xml

diff --git a/package/build.linux b/package/build.linux
index e3543f3..2e711b7 100755
--- a/package/build.linux
+++ b/package/build.linux
@@ -34,15 +34,15 @@ install()
 	RESOURCES_DIR=$SRCDIR/package/mobile-2.3-emulator-manager-resources.package.$TARGET_OS/data/platforms/mobile-2.3/emulator-resources
 	mkdir -p $RESOURCES_DIR/template
 	mkdir -p $RESOURCES_DIR/plugins
-	cp $SRCDIR/template/x86-kiran.xml $RESOURCES_DIR/template/x86-kiran.xml
-	cp $SRCDIR/template/x86-kiran-template.xml $RESOURCES_DIR/template/x86-kiran-template.xml
+	cp $SRCDIR/template/x86-standard.xml $RESOURCES_DIR/template/x86-standard.xml
+	cp $SRCDIR/template/x86-standard-template.xml $RESOURCES_DIR/template/x86-standard-template.xml
 	mv $SRCDIR/plugin-project/mobile-plugin/em-plugin.jar $RESOURCES_DIR/plugins/em-plugin.jar
 
 	W_RESOURCES_DIR=$SRCDIR/package/wearable-2.3-emulator-manager-resources.package.$TARGET_OS/data/platforms/wearable-2.3/emulator-resources
 	mkdir -p $W_RESOURCES_DIR/template
 	mkdir -p $W_RESOURCES_DIR/plugins
-	cp $SRCDIR/template/w-x86-kiran.xml $W_RESOURCES_DIR/template/x86-kiran.xml
-	cp $SRCDIR/template/w-x86-kiran-template.xml $W_RESOURCES_DIR/template/x86-kiran-template.xml
+	cp $SRCDIR/template/w-x86-standard.xml $W_RESOURCES_DIR/template/x86-standard.xml
+	cp $SRCDIR/template/w-x86-standard-template.xml $W_RESOURCES_DIR/template/x86-standard-template.xml
 	mv $SRCDIR/plugin-project/wearable-plugin/em-plugin.jar $W_RESOURCES_DIR/plugins/em-plugin.jar
 }
 
diff --git a/package/build.macos-64 b/package/build.macos-64
index 1490cfb..e79ff9a 100755
--- a/package/build.macos-64
+++ b/package/build.macos-64
@@ -57,15 +57,15 @@ install()
 	RESOURCES_DIR=$SRCDIR/package/mobile-2.3-emulator-manager-resources.package.$TARGET_OS/data/platforms/mobile-2.3/emulator-resources
 	mkdir -p $RESOURCES_DIR/template
 	mkdir -p $RESOURCES_DIR/plugins
-	cp $SRCDIR/template/x86-kiran.xml $RESOURCES_DIR/template/x86-kiran.xml
-	cp $SRCDIR/template/x86-kiran-template.xml $RESOURCES_DIR/template/x86-kiran-template.xml
+        cp $SRCDIR/template/x86-standard.xml $RESOURCES_DIR/template/x86-standard.xml
+        cp $SRCDIR/template/x86-standard-template.xml $RESOURCES_DIR/template/x86-standard-template.xml
 	mv $SRCDIR/plugin-project/mobile-plugin/em-plugin.jar $RESOURCES_DIR/plugins/em-plugin.jar
 
 	W_RESOURCES_DIR=$SRCDIR/package/wearable-2.3-emulator-manager-resources.package.$TARGET_OS/data/platforms/wearable-2.3/emulator-resources
 	mkdir -p $W_RESOURCES_DIR/template
 	mkdir -p $W_RESOURCES_DIR/plugins
-	cp $SRCDIR/template/w-x86-kiran.xml $W_RESOURCES_DIR/template/x86-kiran.xml
-	cp $SRCDIR/template/w-x86-kiran-template.xml $W_RESOURCES_DIR/template/x86-kiran-template.xml
+	cp $SRCDIR/template/w-x86-standard.xml $W_RESOURCES_DIR/template/x86-standard.xml
+        cp $SRCDIR/template/w-x86-standard-template.xml $W_RESOURCES_DIR/template/x86-standard-template.xml
 	mv $SRCDIR/plugin-project/wearable-plugin/em-plugin.jar $W_RESOURCES_DIR/plugins/em-plugin.jar
 }
 
diff --git a/package/build.windows b/package/build.windows
index 30abe8c..72bc2c4 100755
--- a/package/build.windows
+++ b/package/build.windows
@@ -116,11 +116,11 @@ install()
 	mkdir -p $W_RESOURCES_DIR/template
 	mkdir -p $W_RESOURCES_DIR/plugins
 
-	cp $SRCDIR/template/x86-kiran.xml $RESOURCES_DIR/template/x86-kiran.xml
-	cp $SRCDIR/template/x86-kiran-template.xml $RESOURCES_DIR/template/x86-kiran-template.xml
+	cp $SRCDIR/template/x86-standard.xml $RESOURCES_DIR/template/x86-standard.xml
+        cp $SRCDIR/template/x86-standard-template.xml $RESOURCES_DIR/template/x86-standard-template.xml
 	mv $SRCDIR/plugin-project/mobile-plugin/em-plugin.jar $RESOURCES_DIR/plugins/em-plugin.jar
-	cp $SRCDIR/template/w-x86-kiran.xml $W_RESOURCES_DIR/template/x86-kiran.xml
-	cp $SRCDIR/template/w-x86-kiran-template.xml $W_RESOURCES_DIR/template/x86-kiran-template.xml
+	cp $SRCDIR/template/w-x86-standard.xml $W_RESOURCES_DIR/template/x86-standard.xml
+        cp $SRCDIR/template/w-x86-standard-template.xml $W_RESOURCES_DIR/template/x86-standard-template.xml
 	mv $SRCDIR/plugin-project/wearable-plugin/em-plugin.jar $W_RESOURCES_DIR/plugins/em-plugin.jar
 }
 
diff --git a/template/w-x86-kiran-template.xml b/template/w-x86-standard-template.xml
similarity index 99%
rename from template/w-x86-kiran-template.xml
rename to template/w-x86-standard-template.xml
index 827af18..962519a 100644
--- a/template/w-x86-kiran-template.xml
+++ b/template/w-x86-standard-template.xml
@@ -4,7 +4,7 @@
      (VM property UI descriptor)
      Each element in this file is matched with an item of vm property UI. -->
      
-<ItemList xmlns="http://www.tizen.org/em/template" profile="wearable" image="x86-kiran">
+<ItemList xmlns="http://www.tizen.org/em/template" profile="wearable" image="x86-standard">
 
 	<propertyList>
 		<item type="text" name="vmName" title="Name"/>
diff --git a/template/w-x86-kiran.xml b/template/w-x86-standard.xml
similarity index 100%
rename from template/w-x86-kiran.xml
rename to template/w-x86-standard.xml
diff --git a/template/x86-kiran-template.xml b/template/x86-kiran-template.xml
deleted file mode 100644
index d9cd636..0000000
--- a/template/x86-kiran-template.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-
-<!-- This file describes component of VM property UI in Emulator manager.
-     (VM property UI descriptor)
-     Each element in this file is matched with an item of vm property UI. -->
-     
-<ItemList xmlns="http://www.tizen.org/em/template" profile="mobile" image="x86-kiran">
-
-	<propertyList>
-		<item type="text" name="vmName" title="Name"/>
-		<item type="file" name="baseImage" title="Base Image">
-			<option name="dialogType">file</option>
-		</item>
-		<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="wvga"> WVGA,480,800,233 </option>
-<!-- 				<option name="wsvga"> WSVGA,600,1024,207 </option> -->
-<!-- 				<option name="qhd"> QHD,540,960,244 </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> -->
-			</item>
-			<item type="spinner" name="dpi" title="Density"/>
-			<item type="combo" name="skin" title="Skin"/>
-		</item>
-		<item type="combo" name="ramSize" title="RAM Size">
-			<option name="list">512,768,1024</option>
-		</item>
-<!-- 		<item type="combo" name="maxTouch" title="Max Touch Point"/> -->
-		<item type="label" name="fileShare" title="File Sharing">
-			<item type="toggle" name="share" title="Sharing"/>
-			<item type="file" name="directory" title="Directory">
-				<option name="dialogType">directory</option>
-			</item>
-		</item>"
-		<item type="label" name="hwSupport" title="HW Support">
-			<item type="toggle" name="cpu" title="CPU VT"/>
-			<item type="toggle" name="gpu" title="GPU"/>
-		</item>
-	</propertyList>
-
-<!-- Followings are drawn as check box in Emulator Manager vm property UI.-->
-	<deviceList>
-		<item type="lineLabel" name="advancedOption" title="Advanced Option"/>
-		<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 type="checkbox" name="rot" title="Rotation"/>
-		</item>
-		<item type="checkLabel" name="device" title="Device">
-	<!--		<item type="checkbox" name="nfc" title="NFC"/> -->
-			<item type="checkbox" name="camera" title="Camera"/>
-			<item type="checkbox" name="battery" title="Battery"/>
-<!-- 			<item type="checkbox" name="swap" title="Swap Image"> -->
-<!-- 				<option name="defaultOnCreate">on</option> -->
-<!-- 			</item> -->
-<!-- 			<item type="checkbox" name="hwkey" title="HW Key"/> -->
-		</item>
-		<item type="checkLabel" name="jack" title="Jack">
-			<item type="checkbox" name="earjack" title="Ear Jack"/>
-			<item type="checkbox" name="charger" title="Charger"/>
-			<item type="checkbox" name="usb" title="USB"/>
-		</item>
-		<item type="lineLabel" name="experimental" title="Experimental Options"/>
-		<item type="label" name="viewer" title="Viewer">
-			<item type="combo" name="type" title="Type">
-				<option name="list">Native, Web</option>
-				<option name="defaultOnCreate">Native</option>
-			</item>
-		</item>
-	</deviceList>
-
-</ItemList>
-
diff --git a/template/x86-kiran.xml b/template/x86-kiran.xml
deleted file mode 100644
index 0a623ad..0000000
--- a/template/x86-kiran.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<EmulatorConfiguration xmlns="http://www.tizen.org/em">
- <baseInformation>
-	<diskImage profile="mobile"/>
-    </baseInformation>
-    <usability>
-        <logging>
-            <level>NONE</level>
-        </logging>
-        <fileSharing/>
-        <hwVirtualization>true</hwVirtualization>
-        <hwGLAcceleration>true</hwGLAcceleration>
-    </usability>
-    <device>
-        <display>
-            <resolution>
-                <width>480</width>
-                <height>800</height>
-            </resolution>
-            <density unit="dpi">233</density>
-        </display>
-        <RAM>
-            <size unit="MiB">512</size>
-        </RAM>
-        <touch maxTouchPoint="10"/>
-    </device>
-    <advancedOption>
-    	<option name="device">
-<!--	    	<subOption name="nfc" value="on"/> -->
-	    	<subOption name="camera" value="on"/>
-	    	<subOption name="battery" value="on"/>
-<!-- 	    	<subOption name="swap" value="on"/> -->
-<!-- 	    	<subOption name="hwkey" value="on"/> -->
-    	</option>
-    	<option name="jack">
-	    	<subOption name="earjack" value="on"/>
-    		<subOption name="charger" value="on"/>
-    		<subOption name="usb" 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"/>
-    		<subOption name="rot" value="on"/>
-    	</option>
-    </advancedOption>
-</EmulatorConfiguration>
diff --git a/template/x86-standard-template.xml b/template/x86-standard-template.xml
index 5277f30..289eec6 100644
--- a/template/x86-standard-template.xml
+++ b/template/x86-standard-template.xml
@@ -15,10 +15,10 @@
 			<item type="combo" name="resolution" title="Resolution">
 				<!-- name, width, height, dpi -->
 <!-- 				<option name="hvga"> HVGA,320,480,160 </option> -->
-				<option name="wvga"> WVGA,480,800,207 </option>
+				<option name="wvga"> WVGA,480,800,233 </option>
 <!-- 				<option name="wsvga"> WSVGA,600,1024,207 </option> -->
 <!-- 				<option name="qhd"> QHD,540,960,244 </option> -->
-				<option name="hd"> HD,720,1280,316 </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> -->
@@ -52,9 +52,11 @@
 			<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 type="checkbox" name="rot" title="Rotation"/>
 		</item>
 		<item type="checkLabel" name="device" title="Device">
-			<item type="checkbox" name="nfc" title="NFC"/>
+	<!--		<item type="checkbox" name="nfc" title="NFC"/> -->
 			<item type="checkbox" name="camera" title="Camera"/>
 			<item type="checkbox" name="battery" title="Battery"/>
 <!-- 			<item type="checkbox" name="swap" title="Swap Image"> -->
@@ -67,6 +69,13 @@
 			<item type="checkbox" name="charger" title="Charger"/>
 			<item type="checkbox" name="usb" title="USB"/>
 		</item>
+		<item type="lineLabel" name="experimental" title="Experimental Options"/>
+		<item type="label" name="viewer" title="Viewer">
+			<item type="combo" name="type" title="Type">
+				<option name="list">Native, Web</option>
+				<option name="defaultOnCreate">Native</option>
+			</item>
+		</item>
 	</deviceList>
 
 </ItemList>
diff --git a/template/x86-standard.xml b/template/x86-standard.xml
index e1ea352..9ba1c61 100644
--- a/template/x86-standard.xml
+++ b/template/x86-standard.xml
@@ -2,47 +2,49 @@
 <EmulatorConfiguration xmlns="http://www.tizen.org/em">
  <baseInformation>
 	<diskImage profile="mobile"/>
-    </baseInformation>
-    <usability>
-        <logging>
-            <level>NONE</level>
-        </logging>
-        <fileSharing/>
-        <hwVirtualization>true</hwVirtualization>
-        <hwGLAcceleration>true</hwGLAcceleration>
-    </usability>
-    <device>
-        <display>
-            <resolution>
-                <width>720</width>
-                <height>1280</height>
-            </resolution>
-            <density unit="dpi">316</density>
-        </display>
-        <RAM>
-            <size unit="MiB">512</size>
-        </RAM>
-        <touch maxTouchPoint="10"/>
-    </device>
-    <advancedOption>
-    	<option name="device">
-	    	<subOption name="nfc" value="on"/>
-	    	<subOption name="camera" value="on"/>
-	    	<subOption name="battery" value="on"/>
+	</baseInformation>
+	<usability>
+		<logging>
+			<level>NONE</level>
+		</logging>
+		<fileSharing/>
+		<hwVirtualization>true</hwVirtualization>
+		<hwGLAcceleration>true</hwGLAcceleration>
+	</usability>
+	<device>
+		<display>
+			<resolution>
+				<width>480</width>
+				<height>800</height>
+			</resolution>
+			<density unit="dpi">233</density>
+		</display>
+		<RAM>
+			<size unit="MiB">512</size>
+		</RAM>
+		<touch maxTouchPoint="10"/>
+	</device>
+	<advancedOption>
+		<option name="device">
+<!--	    	<subOption name="nfc" value="on"/> -->
+			<subOption name="camera" value="on"/>
+			<subOption name="battery" value="on"/>
 <!-- 	    	<subOption name="swap" value="on"/> -->
 <!-- 	    	<subOption name="hwkey" value="on"/> -->
-    	<option name="jack">
     	</option>
-	    	<subOption name="earjack" value="on"/>
-    		<subOption name="charger" value="on"/>
-    		<subOption name="usb" 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"/>
-    	</option>
-    </advancedOption>
+		<option name="jack">
+			<subOption name="earjack" value="on"/>
+			<subOption name="charger" value="on"/>
+			<subOption name="usb" 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"/>
+			<subOption name="rot" value="on"/>
+		</option>
+	</advancedOption>
 </EmulatorConfiguration>
-- 
2.7.4