projects / sdk / emulator / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0068f22)
skin: no need to setRegion for entire pressed HW keys 26/11526/1
authorGiWoong Kim <giwoong.kim@samsung.com>
Tue, 29 Oct 2013 08:38:12 +0000 (17:38 +0900)
committerGiWoong Kim <giwoong.kim@samsung.com>
Tue, 29 Oct 2013 08:48:02 +0000 (17:48 +0900)
Change-Id: I47785ef2c690dc6048c877813bbbc2d0362fb477
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
14 files changed:
tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/RegionType.java patch | blob | history
tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/RgbType.java patch | blob | history
tizen/src/skin/client/skins/mobile-320x480-1btn/default.dbi patch | blob | history
tizen/src/skin/client/skins/mobile-480x800-3btn/default.dbi patch | blob | history
tizen/src/skin/client/skins/mobile-540x960-3btn/default.dbi patch | blob | history
tizen/src/skin/client/skins/mobile-600x1024-1btn/default.dbi patch | blob | history
tizen/src/skin/client/skins/mobile-720x1280-3btn/default.dbi patch | blob | history
tizen/src/skin/client/src/org/tizen/emulator/skin/custom/SpecialKeyWindow.java patch | blob | history
tizen/src/skin/client/src/org/tizen/emulator/skin/layout/HWKey.java patch | blob | history
tizen/src/skin/client/src/org/tizen/emulator/skin/layout/ProfileSpecificSkinComposer.java patch | blob | history
tizen/src/skin/client/src/org/tizen/emulator/skin/util/HWKeyRegion.java [new file with mode: 0644] patch | blob
tizen/src/skin/client/src/org/tizen/emulator/skin/util/SkinRegion.java [deleted file] patch | blob | history
tizen/src/skin/client/src/org/tizen/emulator/skin/util/SkinUtil.java patch | blob | history
tizen/src/skin/client/xsd/ProfileSpecificSkin-layout.xsd patch | blob | history

diff --git a/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/RegionType.java b/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/RegionType.java
index 8685466390073fd362c0cc3b43252d96aaab0dcc..9a6cd3a2713d513a38bcbd49c822d66d397d3aaf 100644 (file)
--- a/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/RegionType.java
+++ b/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/RegionType.java
@@ -1,4 +1,3 @@
-//
 /**
  * XML Binding
  *
@@ -27,10 +26,11 @@
  *
  */
 
+//
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2013.07.11 at 12:12:25 PM KST 
+// Generated on: 2013.10.29 at 04:58:23 PM KST 
 //
 
 
@@ -55,6 +55,7 @@ import javax.xml.bind.annotation.XmlType;
  *       &lt;attribute name="top" type="{http://www.w3.org/2001/XMLSchema}int" />
  *       &lt;attribute name="width" type="{http://www.w3.org/2001/XMLSchema}int" />
  *       &lt;attribute name="height" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *       &lt;attribute name="update" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
  *     &lt;/restriction>
  *   &lt;/complexContent>
  * &lt;/complexType>
@@ -74,6 +75,8 @@ public class RegionType {
     protected Integer width;
     @XmlAttribute(name = "height")
     protected Integer height;
+    @XmlAttribute(name = "update")
+    protected Boolean update;
 
     /**
      * Gets the value of the left property.
@@ -171,4 +174,32 @@ public class RegionType {
         this.height = value;
     }
 
+    /**
+     * Gets the value of the update property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Boolean }
+     *     
+     */
+    public boolean isUpdate() {
+        if (update == null) {
+            return false;
+        } else {
+            return update;
+        }
+    }
+
+    /**
+     * Sets the value of the update property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Boolean }
+     *     
+     */
+    public void setUpdate(Boolean value) {
+        this.update = value;
+    }
+
 }
diff --git a/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/RgbType.java b/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/RgbType.java
index 2225e786b4235f2df46932bd99645e6c46653438..3a6abf25397a94a25d882dd641ad50bb7ebcb3d3 100644 (file)
--- a/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/RgbType.java
+++ b/tizen/src/skin/client/jaxb_src/org/tizen/emulator/skin/dbi/RgbType.java
@@ -1,4 +1,3 @@
-//
 /**
  * XML Binding
  *
@@ -27,6 +26,7 @@
  *
  */
 
+//
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
diff --git a/tizen/src/skin/client/skins/mobile-320x480-1btn/default.dbi b/tizen/src/skin/client/skins/mobile-320x480-1btn/default.dbi
index f1ce9ca4b4fa0ded2ce60d0d9968c0fe26397281..834c69085088a5a56a95f0cc392eefad4aca45f2 100644 (file)
--- a/tizen/src/skin/client/skins/mobile-320x480-1btn/default.dbi
+++ b/tizen/src/skin/client/skins/mobile-320x480-1btn/default.dbi
@@ -20,7 +20,7 @@
                     <tooltip>Home</tooltip>
                 </keyMap>
                 <keyMap>
-                    <region left="362" top="487" width="15" height="70"/>
+                    <region left="362" top="487" width="15" height="70" update="true"/>
                     <eventInfo>
                         <keyCode>116</keyCode>
                         <keyName>Power</keyName>
@@ -28,7 +28,7 @@
                     <tooltip>Power</tooltip>
                 </keyMap>
                 <keyMap>
-                    <region left="362" top="63" width="15" height="70"/>
+                    <region left="362" top="63" width="15" height="70" update="true"/>
                     <eventInfo>
                         <keyCode>115</keyCode>
                         <keyName>Volume +</keyName>
@@ -36,7 +36,7 @@
                     <tooltip>Volume +</tooltip>
                 </keyMap>
                 <keyMap>
-                    <region left="362" top="140" width="15" height="70"/>
+                    <region left="362" top="140" width="15" height="70" update="true"/>
                     <eventInfo>
                         <keyCode>114</keyCode>
                         <keyName>Volume -</keyName>
@@ -63,7 +63,7 @@
                     <tooltip>Home</tooltip>
                 </keyMap>
                 <keyMap>
-                    <region left="486" top="3" width="70" height="15"/>
+                    <region left="486" top="3" width="70" height="15" update="true"/>
                     <eventInfo>
                         <keyCode>116</keyCode>
                         <keyName>Power</keyName>
@@ -71,7 +71,7 @@
                     <tooltip>Power</tooltip>
                 </keyMap>
                 <keyMap>
-                    <region left="63" top="3" width="70" height="15"/>
+                    <region left="63" top="3" width="70" height="15" update="true"/>
                     <eventInfo>
                         <keyCode>115</keyCode>
                         <keyName>Volume +</keyName>
@@ -79,7 +79,7 @@
                     <tooltip>Volume +</tooltip>
                 </keyMap>
                 <keyMap>
-                    <region left="139" top="3" width="70" height="15"/>
+                    <region left="139" top="3" width="70" height="15" update="true"/>
                     <eventInfo>
                         <keyCode>114</keyCode>
                         <keyName>Volume -</keyName>
@@ -106,7 +106,7 @@
                     <tooltip>Home</tooltip>
                 </keyMap>
                 <keyMap>
-                    <region left="3" top="64" width="15" height="70"/>
+                    <region left="3" top="64" width="15" height="70" update="true"/>
                     <eventInfo>
                         <keyCode>116</keyCode>
                         <keyName>Power</keyName>
@@ -114,7 +114,7 @@
                     <tooltip>Power</tooltip>
                 </keyMap>
                 <keyMap>
-                    <region left="3" top="488" width="15" height="70"/>
+                    <region left="3" top="488" width="15" height="70" update="true"/>
                     <eventInfo>
                         <keyCode>115</keyCode>
                         <keyName>Volume +</keyName>
@@ -122,7 +122,7 @@
                     <tooltip>Volume +</tooltip>
                 </keyMap>
                 <keyMap>
-                    <region left="3" top="412" width="15" height="70"/>
+                    <region left="3" top="412" width="15" height="70" update="true"/>
                     <eventInfo>
                         <keyCode>114</keyCode>
                         <keyName>Volume -</keyName>
@@ -149,7 +149,7 @@
                     <tooltip>Home</tooltip>
                 </keyMap>
                 <keyMap>
-                    <region left="64" top="362" width="70" height="15"/>
+                    <region left="64" top="362" width="70" height="15" update="true"/>
                     <eventInfo>
                         <keyCode>116</keyCode>
                         <keyName>Power</keyName>
@@ -157,7 +157,7 @@
                     <tooltip>Power</tooltip>
                 </keyMap>
                 <keyMap>
-                    <region left="488" top="362" width="70" height="15"/>
+                    <region left="488" top="362" width="70" height="15" update="true"/>
                     <eventInfo>
                         <keyCode>115</keyCode>
                         <keyName>Volume +</keyName>
@@ -165,7 +165,7 @@
                     <tooltip>Volume +</tooltip>
                 </keyMap>
                 <keyMap>
-                    <region left="412" top="362" width="70" height="15"/>
+                    <region left="412" top="362" width="70" height="15" update="true"/>
                     <eventInfo>
                         <keyCode>114</keyCode>
                         <keyName>Volume -</keyName>
diff --git a/tizen/src/skin/client/skins/mobile-480x800-3btn/default.dbi b/tizen/src/skin/client/skins/mobile-480x800-3btn/default.dbi
index 6b39a7b3afcd63206778d5bf3c18962d7141b7b2..2c560f95d212d22a5a36feba4dc1ce1c2b65ac94 100644 (file)
--- a/tizen/src/skin/client/skins/mobile-480x800-3btn/default.dbi
+++ b/tizen/src/skin/client/skins/mobile-480x800-3btn/default.dbi
@@ -36,7 +36,7 @@
                     <tooltip>Back</tooltip>
                 </keyMap>
                 <keyMap>
-                    <region height="74" left="541" top="819" width="20"/>
+                    <region height="74" left="541" top="819" width="20" update="true"/>
                     <eventInfo>
                         <keyCode>116</keyCode>
                         <keyName>Power</keyName>
@@ -44,7 +44,7 @@
                     <tooltip>Power</tooltip>
                 </keyMap>
                 <keyMap>
-                    <region height="74" left="541" top="81" width="20"/>
+                    <region height="74" left="541" top="81" width="20" update="true"/>
                     <eventInfo>
                         <keyCode>115</keyCode>
                         <keyName>Volume +</keyName>
@@ -52,7 +52,7 @@
                     <tooltip>Volume +</tooltip>
                 </keyMap>
                 <keyMap>
-                    <region height="74" left="541" top="167" width="20"/>
+                    <region height="74" left="541" top="167" width="20" update="true"/>
                     <eventInfo>
                         <keyCode>114</keyCode>
                         <keyName>Volume -</keyName>
@@ -95,7 +95,7 @@
                     <tooltip>Back</tooltip>
                 </keyMap>
                 <keyMap>
-                    <region height="20" left="818" top="2" width="74"/>
+                    <region height="20" left="818" top="2" width="74" update="true"/>
                     <eventInfo>
                         <keyCode>116</keyCode>
                         <keyName>Power</keyName>
@@ -103,7 +103,7 @@
                     <tooltip>Power</tooltip>
                 </keyMap>
                 <keyMap>
-                    <region left="80" top="2" width="74" height="20"/>
+                    <region left="80" top="2" width="74" height="20" update="true"/>
                     <eventInfo>
                         <keyCode>115</keyCode>
                         <keyName>Volume +</keyName>
@@ -111,7 +111,7 @@
                     <tooltip>Volume +</tooltip>
                 </keyMap>
                 <keyMap>
-                    <region left="165" top="2" width="74" height="20"/>
+                    <region left="165" top="2" width="74" height="20" update="true"/>
                     <eventInfo>
                         <keyCode>114</keyCode>
                         <keyName>Volume -</keyName>
@@ -154,7 +154,7 @@
                     <tooltip>Back</tooltip>
                 </keyMap>
                 <keyMap>
-                    <region left="2" top="84" width="20" height="74"/>
+                    <region left="2" top="84" width="20" height="74" update="true"/>
                     <eventInfo>
                         <keyCode>116</keyCode>
                         <keyName>Power</keyName>
@@ -162,7 +162,7 @@
                     <tooltip>Power</tooltip>
                 </keyMap>
                 <keyMap>
-                    <region left="2" top="821" width="20" height="74"/>
+                    <region left="2" top="821" width="20" height="74" update="true"/>
                     <eventInfo>
                         <keyCode>115</keyCode>
                         <keyName>Volume +</keyName>
@@ -170,7 +170,7 @@
                     <tooltip>Volume +</tooltip>
                 </keyMap>
                 <keyMap>
-                    <region left="2" top="735" width="20" height="74"/>
+                    <region left="2" top="735" width="20" height="74" update="true"/>
                     <eventInfo>
                         <keyCode>114</keyCode>
                         <keyName>Volume -</keyName>
@@ -213,7 +213,7 @@
                     <tooltip>Back</tooltip>
                 </keyMap>
                 <keyMap>
-                    <region left="84" top="539" width="74" height="20"/>
+                    <region left="84" top="539" width="74" height="20" update="true"/>
                     <eventInfo>
                         <keyCode>116</keyCode>
                         <keyName>Power</keyName>
@@ -221,7 +221,7 @@
                     <tooltip>Power</tooltip>
                 </keyMap>
                 <keyMap>
-                    <region left="822" top="539" width="74" height="20"/>
+                    <region left="822" top="539" width="74" height="20" update="true"/>
                     <eventInfo>
                         <keyCode>115</keyCode>
                         <keyName>Volume +</keyName>
@@ -229,7 +229,7 @@
                     <tooltip>Volume +</tooltip>
                 </keyMap>
                 <keyMap>
-                    <region left="735" top="539" width="74" height="20"/>
+                    <region left="735" top="539" width="74" height="20" update="true"/>
                     <eventInfo>
                         <keyCode>114</keyCode>
                         <keyName>Volume -</keyName>
diff --git a/tizen/src/skin/client/skins/mobile-540x960-3btn/default.dbi b/tizen/src/skin/client/skins/mobile-540x960-3btn/default.dbi
index ba7af217bebe46d3444c2c1734d3ec9af2e2dd80..1d1fe21090046b36d0dc52eb9074215430aae9a1 100644 (file)
--- a/tizen/src/skin/client/skins/mobile-540x960-3btn/default.dbi
+++ b/tizen/src/skin/client/skins/mobile-540x960-3btn/default.dbi
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EmulatorUI xmlns="http://www.tizen.org/emulator/skin/dbi" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <dbi version="2.0"/>
+    <dbi version="2.2"/>
     <rotations>
         <rotation name="Portrait">
             <display id="0">
@@ -36,7 +36,7 @@
                     <tooltip>Back</tooltip>
                 </keyMap>
                 <keyMap>
-                    <region left="600" top="979" width="20" height="74"/>
+                    <region left="600" top="979" width="20" height="74" update="true"/>
                     <eventInfo>
                         <keyCode>116</keyCode>
                         <keyName>Power</keyName>
@@ -44,7 +44,7 @@
                     <tooltip>Power</tooltip>
                 </keyMap>
                 <keyMap>
-                    <region left="600" top="80" width="20" height="74"/>
+                    <region left="600" top="80" width="20" height="74" update="true"/>
                     <eventInfo>
                         <keyCode>115</keyCode>
                         <keyName>Volume +</keyName>
@@ -52,7 +52,7 @@
                     <tooltip>Volume +</tooltip>
                 </keyMap>
                 <keyMap>
-                    <region left="600" top="167" width="20" height="74"/>
+                    <region left="600" top="167" width="20" height="74" update="true"/>
                     <eventInfo>
                         <keyCode>114</keyCode>
                         <keyName>Volume -</keyName>
@@ -95,7 +95,7 @@
                     <tooltip>Back</tooltip>
                 </keyMap>
                 <keyMap>
-                    <region left="978" top="1" width="74" height="20"/>
+                    <region left="978" top="1" width="74" height="20" update="true"/>
                     <eventInfo>
                         <keyCode>116</keyCode>
                         <keyName>Power</keyName>
@@ -103,7 +103,7 @@
                     <tooltip>Power</tooltip>
                 </keyMap>
                 <keyMap>
-                    <region left="80" top="1" width="74" height="20"/>
+                    <region left="80" top="1" width="74" height="20" update="true"/>
                     <eventInfo>
                         <keyCode>115</keyCode>
                         <keyName>Volume +</keyName>
@@ -111,7 +111,7 @@
                     <tooltip>Volume +</tooltip>
                 </keyMap>
                 <keyMap>
-                    <region left="166" top="1" width="74" height="20"/>
+                    <region left="166" top="1" width="74" height="20" update="true"/>
                     <eventInfo>
                         <keyCode>114</keyCode>
                         <keyName>Volume -</keyName>
@@ -154,7 +154,7 @@
                     <tooltip>Back</tooltip>
                 </keyMap>
                 <keyMap>
-                    <region left="1" top="84" width="20" height="74"/>
+                    <region left="1" top="84" width="20" height="74" update="true"/>
                     <eventInfo>
                         <keyCode>116</keyCode>
                         <keyName>Power</keyName>
@@ -162,7 +162,7 @@
                     <tooltip>Power</tooltip>
                 </keyMap>
                 <keyMap>
-                    <region left="1" top="981" width="20" height="74"/>
+                    <region left="1" top="981" width="20" height="74" update="true"/>
                     <eventInfo>
                         <keyCode>115</keyCode>
                         <keyName>Volume +</keyName>
@@ -170,7 +170,7 @@
                     <tooltip>Volume +</tooltip>
                 </keyMap>
                 <keyMap>
-                    <region left="1" top="895" width="20" height="74"/>
+                    <region left="1" top="895" width="20" height="74" update="true"/>
                     <eventInfo>
                         <keyCode>114</keyCode>
                         <keyName>Volume -</keyName>
@@ -213,7 +213,7 @@
                     <tooltip>Back</tooltip>
                 </keyMap>
                 <keyMap>
-                    <region left="84" top="600" width="74" height="20"/>
+                    <region left="84" top="600" width="74" height="20" update="true"/>
                     <eventInfo>
                         <keyCode>116</keyCode>
                         <keyName>Power</keyName>
@@ -221,7 +221,7 @@
                     <tooltip>Power</tooltip>
                 </keyMap>
                 <keyMap>
-                    <region left="980" top="600" width="74" height="20"/>
+                    <region left="980" top="600" width="74" height="20" update="true"/>
                     <eventInfo>
                         <keyCode>115</keyCode>
                         <keyName>Volume +</keyName>
@@ -229,7 +229,7 @@
                     <tooltip>Volume +</tooltip>
                 </keyMap>
                 <keyMap>
-                    <region left="894" top="600" width="74" height="20"/>
+                    <region left="894" top="600" width="74" height="20" update="true"/>
                     <eventInfo>
                         <keyCode>114</keyCode>
                         <keyName>Volume -</keyName>
diff --git a/tizen/src/skin/client/skins/mobile-600x1024-1btn/default.dbi b/tizen/src/skin/client/skins/mobile-600x1024-1btn/default.dbi
index c01281375855d9e5847145825a93e8759233857a..2bf96a5fed4d7e460808cfbac4927a9d3f7056bd 100644 (file)
--- a/tizen/src/skin/client/skins/mobile-600x1024-1btn/default.dbi
+++ b/tizen/src/skin/client/skins/mobile-600x1024-1btn/default.dbi
@@ -20,7 +20,7 @@
                     <tooltip>Home</tooltip>
                 </keyMap>
                 <keyMap>
-                    <region left="690" top="1055" width="24" height="88"/>
+                    <region left="690" top="1055" width="24" height="88" update="true"/>
                     <eventInfo>
                         <keyCode>116</keyCode>
                         <keyName>Power</keyName>
@@ -28,7 +28,7 @@
                     <tooltip>Power</tooltip>
                 </keyMap>
                 <keyMap>
-                    <region left="690" top="101" width="24" height="88"/>
+                    <region left="690" top="101" width="24" height="88" update="true"/>
                     <eventInfo>
                         <keyCode>115</keyCode>
                         <keyName>Volume +</keyName>
@@ -36,7 +36,7 @@
                     <tooltip>Volume +</tooltip>
                 </keyMap>
                 <keyMap>
-                    <region left="690" top="194" width="24" height="88"/>
+                    <region left="690" top="194" width="24" height="88" update="true"/>
                     <eventInfo>
                         <keyCode>114</keyCode>
                         <keyName>Volume -</keyName>
@@ -63,7 +63,7 @@
                     <tooltip>Home</tooltip>
                 </keyMap>
                 <keyMap>
-                    <region left="1054" top="1" width="88" height="24"/>
+                    <region left="1054" top="1" width="88" height="24" update="true"/>
                     <eventInfo>
                         <keyCode>116</keyCode>
                         <keyName>Power</keyName>
@@ -71,7 +71,7 @@
                     <tooltip>Power</tooltip>
                 </keyMap>
                 <keyMap>
-                    <region left="99" top="1" width="88" height="24"/>
+                    <region left="99" top="1" width="88" height="24" update="true"/>
                     <eventInfo>
                         <keyCode>115</keyCode>
                         <keyName>Volume +</keyName>
@@ -79,7 +79,7 @@
                     <tooltip>Volume +</tooltip>
                 </keyMap>
                 <keyMap>
-                    <region left="194" top="1" width="88" height="24"/>
+                    <region left="194" top="1" width="88" height="24" update="true"/>
                     <eventInfo>
                         <keyCode>114</keyCode>
                         <keyName>Volume -</keyName>
@@ -106,7 +106,7 @@
                     <tooltip>Home</tooltip>
                 </keyMap>
                 <keyMap>
-                    <region left="1" top="106" width="24" height="88"/>
+                    <region left="1" top="106" width="24" height="88" update="true"/>
                     <eventInfo>
                         <keyCode>116</keyCode>
                         <keyName>Power</keyName>
@@ -114,7 +114,7 @@
                     <tooltip>Power</tooltip>
                 </keyMap>
                 <keyMap>
-                    <region left="1" top="1059" width="24" height="88"/>
+                    <region left="1" top="1059" width="24" height="88" update="true"/>
                     <eventInfo>
                         <keyCode>115</keyCode>
                         <keyName>Volume +</keyName>
@@ -122,7 +122,7 @@
                     <tooltip>Volume +</tooltip>
                 </keyMap>
                 <keyMap>
-                    <region left="1" top="964" width="24" height="88"/>
+                    <region left="1" top="964" width="24" height="88" update="true"/>
                     <eventInfo>
                         <keyCode>114</keyCode>
                         <keyName>Volume -</keyName>
@@ -149,7 +149,7 @@
                     <tooltip>Home</tooltip>
                 </keyMap>
                 <keyMap>
-                    <region left="105" top="690" width="88" height="24"/>
+                    <region left="105" top="690" width="88" height="24" update="true"/>
                     <eventInfo>
                         <keyCode>116</keyCode>
                         <keyName>Power</keyName>
@@ -157,7 +157,7 @@
                     <tooltip>Power</tooltip>
                 </keyMap>
                 <keyMap>
-                    <region left="1058" top="690" width="88" height="24"/>
+                    <region left="1058" top="690" width="88" height="24" update="true"/>
                     <eventInfo>
                         <keyCode>115</keyCode>
                         <keyName>Volume +</keyName>
@@ -165,7 +165,7 @@
                     <tooltip>Volume +</tooltip>
                 </keyMap>
                 <keyMap>
-                    <region left="965" top="690" width="88" height="24"/>
+                    <region left="965" top="690" width="88" height="24" update="true"/>
                     <eventInfo>
                         <keyCode>114</keyCode>
                         <keyName>Volume -</keyName>
diff --git a/tizen/src/skin/client/skins/mobile-720x1280-3btn/default.dbi b/tizen/src/skin/client/skins/mobile-720x1280-3btn/default.dbi
index 7c7187deae4914153953ebd056ad88085ce39e50..e9d9a7ecf95f15be4ecb102976a3472ca1209497 100644 (file)
--- a/tizen/src/skin/client/skins/mobile-720x1280-3btn/default.dbi
+++ b/tizen/src/skin/client/skins/mobile-720x1280-3btn/default.dbi
@@ -36,7 +36,7 @@
                     <tooltip>Back</tooltip>
                 </keyMap>
                 <keyMap>
-                    <region left="841" top="1309" width="24" height="96"/>
+                    <region left="841" top="1309" width="24" height="96" update="true"/>
                     <eventInfo>
                         <keyCode>116</keyCode>
                         <keyName>Power</keyName>
@@ -44,7 +44,7 @@
                     <tooltip>Power</tooltip>
                 </keyMap>
                 <keyMap>
-                    <region left="841" top="108" width="24" height="96"/>
+                    <region left="841" top="108" width="24" height="96" update="true"/>
                     <eventInfo>
                         <keyCode>115</keyCode>
                         <keyName>Volume +</keyName>
@@ -52,7 +52,7 @@
                     <tooltip>Volume +</tooltip>
                 </keyMap>
                 <keyMap>
-                    <region left="841" top="219" width="24" height="96"/>
+                    <region left="841" top="219" width="24" height="96" update="true"/>
                     <eventInfo>
                         <keyCode>114</keyCode>
                         <keyName>Volume -</keyName>
@@ -95,7 +95,7 @@
                     <tooltip>Back</tooltip>
                 </keyMap>
                 <keyMap>
-                    <region left="1308" top="2" width="96" height="24"/>
+                    <region left="1308" top="2" width="96" height="24" update="true"/>
                     <eventInfo>
                         <keyCode>116</keyCode>
                         <keyName>Power</keyName>
@@ -103,7 +103,7 @@
                     <tooltip>Power</tooltip>
                 </keyMap>
                 <keyMap>
-                    <region left="108" top="2" width="96" height="24"/>
+                    <region left="108" top="2" width="96" height="24" update="true"/>
                     <eventInfo>
                         <keyCode>115</keyCode>
                         <keyName>Volume +</keyName>
@@ -111,7 +111,7 @@
                     <tooltip>Volume +</tooltip>
                 </keyMap>
                 <keyMap>
-                    <region left="217" top="2" width="96" height="24"/>
+                    <region left="217" top="2" width="96" height="24" update="true"/>
                     <eventInfo>
                         <keyCode>114</keyCode>
                         <keyName>Volume -</keyName>
@@ -154,7 +154,7 @@
                     <tooltip>Back</tooltip>
                 </keyMap>
                 <keyMap>
-                    <region left="2" top="110" width="24" height="96"/>
+                    <region left="2" top="110" width="24" height="96" update="true"/>
                     <eventInfo>
                         <keyCode>116</keyCode>
                         <keyName>Power</keyName>
@@ -162,7 +162,7 @@
                     <tooltip>Power</tooltip>
                 </keyMap>
                 <keyMap>
-                    <region left="2" top="1310" width="24" height="96"/>
+                    <region left="2" top="1310" width="24" height="96" update="true"/>
                     <eventInfo>
                         <keyCode>115</keyCode>
                         <keyName>Volume +</keyName>
@@ -170,7 +170,7 @@
                     <tooltip>Volume +</tooltip>
                 </keyMap>
                 <keyMap>
-                    <region left="2" top="1200" width="24" height="96"/>
+                    <region left="2" top="1200" width="24" height="96" update="true"/>
                     <eventInfo>
                         <keyCode>114</keyCode>
                         <keyName>Volume -</keyName>
@@ -213,7 +213,7 @@
                     <tooltip>Back</tooltip>
                 </keyMap>
                 <keyMap>
-                    <region left="109" top="841" width="96" height="24"/>
+                    <region left="109" top="841" width="96" height="24" update="true"/>
                     <eventInfo>
                         <keyCode>116</keyCode>
                         <keyName>Power</keyName>
@@ -221,7 +221,7 @@
                     <tooltip>Power</tooltip>
                 </keyMap>
                 <keyMap>
-                    <region left="1309" top="841" width="96" height="24"/>
+                    <region left="1309" top="841" width="96" height="24" update="true"/>
                     <eventInfo>
                         <keyCode>115</keyCode>
                         <keyName>Volume +</keyName>
@@ -229,7 +229,7 @@
                     <tooltip>Volume +</tooltip>
                 </keyMap>
                 <keyMap>
-                    <region left="1199" top="841" width="96" height="24"/>
+                    <region left="1199" top="841" width="96" height="24" update="true"/>
                     <eventInfo>
                         <keyCode>114</keyCode>
                         <keyName>Volume -</keyName>
diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/custom/SpecialKeyWindow.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/custom/SpecialKeyWindow.java
index 0cc657f8b03cbc473f778c93c4fdb92bde422815..40b9fca4d58e0ccc43220932bf55b41cdf393d42 100644 (file)
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/custom/SpecialKeyWindow.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/custom/SpecialKeyWindow.java
@@ -69,7 +69,7 @@ import org.tizen.emulator.skin.keywindow.dbi.RegionType;
 import org.tizen.emulator.skin.layout.HWKey;
 import org.tizen.emulator.skin.util.IOUtil;
 import org.tizen.emulator.skin.util.JaxbUtil;
-import org.tizen.emulator.skin.util.SkinRegion;
+import org.tizen.emulator.skin.util.HWKeyRegion;
 import org.tizen.emulator.skin.util.SkinUtil;
 import org.tizen.emulator.skin.util.SwtUtil;
 
@@ -194,7 +194,7 @@ public class SpecialKeyWindow extends SkinWindow {
                                HWKey hwKey = new HWKey(
                                                eventInfo.getKeyName(),
                                                eventInfo.getKeyCode(),
-                                               new SkinRegion(scaledX, scaledY, scaledWidth, scaledHeight),
+                                               new HWKeyRegion(scaledX, scaledY, scaledWidth, scaledHeight),
                                                keyEntry.getTooltip());
 
                                return hwKey;
diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/HWKey.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/HWKey.java
index 257f476f0e2d45446483ee8b9319d209e7f575e4..23ba4abcd2c76dc0b1dcbbdb158275db68797a3a 100644 (file)
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/HWKey.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/HWKey.java
@@ -28,13 +28,13 @@
 
 package org.tizen.emulator.skin.layout;
 
-import org.tizen.emulator.skin.util.SkinRegion;
+import org.tizen.emulator.skin.util.HWKeyRegion;
 import org.tizen.emulator.skin.util.SkinUtil;
 
 public class HWKey {
        private String name;
        private int keyCode;
-       private SkinRegion region;
+       private HWKeyRegion region;
        private String tooltip;
 
        /**
@@ -45,7 +45,7 @@ public class HWKey {
                this.keyCode = SkinUtil.UNKNOWN_KEYCODE;
        }
 
-       public HWKey(String name, int keyCode, SkinRegion region, String tooltip) {
+       public HWKey(String name, int keyCode, HWKeyRegion region, String tooltip) {
                this.name = name;
                this.keyCode = keyCode;
                this.region = region;
@@ -71,11 +71,11 @@ public class HWKey {
        }
 
        /* region */
-       public SkinRegion getRegion() {
+       public HWKeyRegion getRegion() {
                return region;
        }
 
-       public void setRegion(SkinRegion region) {
+       public void setRegion(HWKeyRegion region) {
                this.region = region;
        }
 
diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/ProfileSpecificSkinComposer.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/ProfileSpecificSkinComposer.java
index 9abcc3f47d308af887249ad041cd83bfef9b22b1..afe649a9cd78736254487ecd28b9830ec407505b 100644 (file)
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/ProfileSpecificSkinComposer.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/ProfileSpecificSkinComposer.java
@@ -485,7 +485,7 @@ public class ProfileSpecificSkinComposer implements ISkinComposer {
                                                                        pressedHWKey.getRegion().width, pressedHWKey.getRegion().height, false);
 
                                                        /* roll back HW key region */
-                                                       if (pressedHWKey.getKeyCode() != 101) { // TODO: not necessary for home key
+                                                       if (pressedHWKey.getRegion().isNeedUpdate() == true) {
                                                                SkinUtil.trimShell(shell, currentState.getCurrentImage(),
                                                                                pressedHWKey.getRegion().x, pressedHWKey.getRegion().y,
                                                                                pressedHWKey.getRegion().width, pressedHWKey.getRegion().height);
@@ -529,7 +529,7 @@ public class ProfileSpecificSkinComposer implements ISkinComposer {
                                                                        hwKey.getRegion().width, hwKey.getRegion().height, false);
 
                                                        /* set pressed HW key region */
-                                                       if (hwKey.getKeyCode() != 101) { // TODO: not necessary for home key
+                                                       if (hwKey.getRegion().isNeedUpdate() == true) {
                                                                SkinUtil.trimShell(shell, currentState.getCurrentKeyPressedImage(),
                                                                                hwKey.getRegion().x, hwKey.getRegion().y,
                                                                                hwKey.getRegion().width, hwKey.getRegion().height);
diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/util/HWKeyRegion.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/util/HWKeyRegion.java
new file mode 100644 (file)
index 0000000..140d736
--- /dev/null
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/util/HWKeyRegion.java
@@ -0,0 +1,63 @@
+/**
+ * Hardware Key Region
+ *
+ * Copyright (C) 2011 - 2012 Samsung Electronics Co., Ltd. All rights reserved.
+ *
+ * Contact:
+ * GiWoong Kim <giwoong.kim@samsung.com>
+ * YeongKyoon Lee <yeongkyoon.lee@samsung.com>
+ * HyunJun Son
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * Contributors:
+ * - S-Core Co., Ltd
+ *
+ */
+
+package org.tizen.emulator.skin.util;
+
+/**
+ * 
+ *
+ */
+public class HWKeyRegion {
+       public int x;
+       public int y;
+       public int width;
+       public int height;
+       private boolean update;
+
+       public HWKeyRegion(int x, int y, int width, int height) {
+               this.x = x;
+               this.y = y;
+               this.width = width;
+               this.height = height;
+               this.update = false;
+       }
+
+       public HWKeyRegion(int x, int y, int width, int height,
+                       boolean update) {
+               this.x = x;
+               this.y = y;
+               this.width = width;
+               this.height = height;
+               this.update = update;
+       }
+
+       public boolean isNeedUpdate() {
+               return update;
+       }
+}
diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/util/SkinRegion.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/util/SkinRegion.java
deleted file mode 100644 (file)
index 5c5d1dc..0000000
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/util/SkinRegion.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * 
- *
- * Copyright (C) 2011 - 2012 Samsung Electronics Co., Ltd. All rights reserved.
- *
- * Contact:
- * GiWoong Kim <giwoong.kim@samsung.com>
- * YeongKyoon Lee <yeongkyoon.lee@samsung.com>
- * HyunJun Son
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * Contributors:
- * - S-Core Co., Ltd
- *
- */
-
-package org.tizen.emulator.skin.util;
-
-/**
- * 
- *
- */
-public class SkinRegion {
-       public int x;
-       public int y;
-       public int width;
-       public int height;
-       
-       public SkinRegion( int x, int y, int width, int height ) {
-               this.x = x;
-               this.y = y;
-               this.width = width;
-               this.height = height;
-       }
-       
-}
diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/util/SkinUtil.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/util/SkinUtil.java
index 308584cc594f98fc86e36ebf493d7972682cfc08..1dc21707c07b8bcfc632e829e80bff2b02d5e3d4 100644 (file)
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/util/SkinUtil.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/util/SkinUtil.java
@@ -175,7 +175,8 @@ public class SkinUtil {
                                HWKey hwKey = new HWKey(
                                                eventInfo.getKeyName(),
                                                eventInfo.getKeyCode(),
-                                               new SkinRegion(scaledX, scaledY, scaledWidth, scaledHeight),
+                                               new HWKeyRegion(scaledX, scaledY, scaledWidth, scaledHeight,
+                                                               keyEntry.getRegion().isUpdate()),
                                                keyEntry.getTooltip());
 
                                return hwKey;
diff --git a/tizen/src/skin/client/xsd/ProfileSpecificSkin-layout.xsd b/tizen/src/skin/client/xsd/ProfileSpecificSkin-layout.xsd
index 0c88f58794ef004d0b289a62f00f7224b2ca87f6..fdf541e3b64cba764c4c07b18cd6b2449956ae7b 100644 (file)
--- a/tizen/src/skin/client/xsd/ProfileSpecificSkin-layout.xsd
+++ b/tizen/src/skin/client/xsd/ProfileSpecificSkin-layout.xsd
@@ -78,6 +78,7 @@ xmlns:dbi="http://www.tizen.org/emulator/skin/dbi" elementFormDefault="qualified
                <attribute name="top" type="int"> </attribute>
                <attribute name="width" type="int"> </attribute>
                <attribute name="height" type="int"> </attribute>
+               <attribute name="update" type="boolean" default="false" use="optional"> </attribute>
        </complexType>
 
        <complexType name="hoverType">
Domain: SDK / Emulator;