[Title] emulator-manager : change multi touch point 3->6 and update version

[Desc.] change multi touch point (3->6) and update version (1.3.48)
[Issue] N/A

diff --git a/VERSION b/VERSION
index fe68078..8d385ee 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.0.0a4-RC1
+2.0.0a4-RC2

diff --git a/package/changelog b/package/changelog
index bd4d42d..4155071 100644 (file)
--- a/package/changelog
+++ b/package/changelog
@@ -1,3 +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 (file)
--- 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 573ebdb..e53ee72 100644 (file)
--- a/src/org/tizen/emulator/manager/ui/detail/TableWidget.java
+++ b/src/org/tizen/emulator/manager/ui/detail/TableWidget.java
@@ -792,7 +792,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 cee64dc..fd41257 100644 (file)
--- 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;
@@ -247,7 +248,7 @@ public class VMPropertyValue implements Cloneable {
                if (touchType != null) {
                        maxTouchCount = touchType.getMaxTouchPoint();
                } else {
-                       maxTouchCount = 3;
+                       maxTouchCount = maxTouch;
                }
 
                addOptions = property.getConfiguration().getUsability().getAdvancedOptions();
@@ -274,7 +275,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 (file)
--- 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>