From cf9c28704b6591b71f017a7d7bb32d9e4cd4384e Mon Sep 17 00:00:00 2001
From: jihye kim <jihye1128.kim@samsung.com>
Date: Tue, 30 Oct 2012 17:54:21 +0900
Subject: [PATCH] [Title] emulator-manager : change multi touch point 3->6 and
 add changelog file [Desc.] change multi touch point (3->6) and add changelog
 file [Issue] N/A

---
 VERSION                                                   | 2 +-
 package/changelog                                         | 8 ++++++++
 package/pkginfo.manifest                                  | 2 +-
 src/org/tizen/emulator/manager/ui/detail/TableWidget.java | 2 +-
 src/org/tizen/emulator/manager/vms/VMPropertyValue.java   | 5 +++--
 standard.xml                                              | 2 +-
 6 files changed, 15 insertions(+), 6 deletions(-)
 create mode 100644 package/changelog

diff --git a/VERSION b/VERSION
index 82d4561..997bba2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.0.0a3
+2.0.0a4
diff --git a/package/changelog b/package/changelog
new file mode 100644
index 0000000..4155071
--- /dev/null
+++ b/package/changelog
@@ -0,0 +1,8 @@
+*1.3.48
+- change multi touch's max point 3->6
+- update version
+== 김지혜 <jihye1128.kim@samsung.com> 2012-10-30
+
+*1.3.47
+- update version
+== 김지혜 <jihye1128.kim@samsung.com> 2012-10-23
diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index 728db64..066240f 100644
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,5 +1,5 @@
 Source: emulator-manager
-Version: 1.3.47
+Version: 1.3.48
 Maintainer: Yeong-Kyoon Lee<yeongkyoon.lee@samsung.com>
 
 Package: emulator-manager
diff --git a/src/org/tizen/emulator/manager/ui/detail/TableWidget.java b/src/org/tizen/emulator/manager/ui/detail/TableWidget.java
index 8f3f147..88de2cb 100644
--- a/src/org/tizen/emulator/manager/ui/detail/TableWidget.java
+++ b/src/org/tizen/emulator/manager/ui/detail/TableWidget.java
@@ -794,7 +794,7 @@ class TouchPointLabel extends TableWidget {
 
 	public void setValue(VMPropertyValue value) {
 		// fixed value
-		value.maxTouchCount = 3;
+		value.maxTouchCount = VMPropertyValue.maxTouch;
 	}
 
 	public boolean settingWidget(Table table, VMPropertyValue value) {
diff --git a/src/org/tizen/emulator/manager/vms/VMPropertyValue.java b/src/org/tizen/emulator/manager/vms/VMPropertyValue.java
index 888f12d..4b1a614 100644
--- a/src/org/tizen/emulator/manager/vms/VMPropertyValue.java
+++ b/src/org/tizen/emulator/manager/vms/VMPropertyValue.java
@@ -66,6 +66,7 @@ public class VMPropertyValue implements Cloneable {
 
 	public boolean isHWVirtualization;
 	public boolean isGLAcceleration;
+	public static int maxTouch = 6;
 	public int maxTouchCount;
 
 	public String addOptions;
@@ -248,7 +249,7 @@ public class VMPropertyValue implements Cloneable {
 		if (touchType != null) {
 			maxTouchCount = touchType.getMaxTouchPoint();
 		} else {
-			maxTouchCount = 3;
+			maxTouchCount = maxTouch;
 		}
 
 		addOptions = property.getConfiguration().getUsability().getAdvancedOptions();
@@ -275,7 +276,7 @@ public class VMPropertyValue implements Cloneable {
 		isHWVirtualization = CheckVirtualization.getInstance().isSupportVirtualization();
 		isGLAcceleration = true;
 
-		maxTouchCount = 3;
+		maxTouchCount = maxTouch;
 
 		addOptions = null;
 	}
diff --git a/standard.xml b/standard.xml
index 60c947e..b7e8f10 100644
--- a/standard.xml
+++ b/standard.xml
@@ -19,6 +19,6 @@
         <RAM>
             <size unit="MiB">512</size>
         </RAM>
-        <touch maxTouchPoint="3"/>
+        <touch maxTouchPoint="6"/>
     </device>
 </EmulatorConfiguration>
-- 
2.7.4