projects / platform / core / uifw / ise-default.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5f23f41)
Modify keypad layout according to GUI file 77/151177/26
authorLigang Xie <ligang0.xie@samsung.com>
Wed, 20 Sep 2017 06:43:16 +0000 (14:43 +0800)
committerJihoon Kim <jihoon48.kim@samsung.com>
Mon, 16 Oct 2017 08:25:01 +0000 (08:25 +0000)
Change-Id: Ie34fb858169b695c581f4b8530f4548e5d4b96ce
Signed-off-by: Ligang Xie <ligang0.xie@samsung.com>
16 files changed:
data/layout/wearable/LYT_PORTRAIT_3X4_DATETIME.xml patch | blob | history
data/layout/wearable/LYT_PORTRAIT_3X4_MONTH.xml patch | blob | history
data/layout/wearable/LYT_PORTRAIT_3X4_NUMONLY.xml patch | blob | history
data/layout/wearable/LYT_PORTRAIT_3X4_NUMONLY_DEC.xml patch | blob | history
data/layout/wearable/LYT_PORTRAIT_3X4_NUMONLY_SIG.xml patch | blob | history
data/layout/wearable/LYT_PORTRAIT_3X4_NUMONLY_SIG_DEC.xml patch | blob | history
data/layout/wearable/LYT_PORTRAIT_3X4_PASSWD.xml patch | blob | history
data/layout/wearable/LYT_PORTRAIT_3X4_TELEPHONE.xml patch | blob | history
data/layout/wearable/LYT_PORTRAIT_4X4_CHINESE.xml patch | blob | history
data/layout/wearable/LYT_PORTRAIT_4X4_EMAIL.xml patch | blob | history
data/layout/wearable/LYT_PORTRAIT_4X4_ENGLISH.xml patch | blob | history
data/layout/wearable/LYT_PORTRAIT_STT.xml patch | blob | history
data/layout/wearable/autopopup_configure.xml patch | blob | history
data/layout/wearable/label_property.xml patch | blob | history
data/layout/wearable/magnifier_configure.xml patch | blob | history
src/candidate/efl/candidate-efl.cpp patch | blob | history

diff --git a/data/layout/wearable/LYT_PORTRAIT_3X4_DATETIME.xml b/data/layout/wearable/LYT_PORTRAIT_3X4_DATETIME.xml
index 898aefd..58d13e7 100644 (file)
--- a/data/layout/wearable/LYT_PORTRAIT_3X4_DATETIME.xml
+++ b/data/layout/wearable/LYT_PORTRAIT_3X4_DATETIME.xml
@@ -5,6 +5,7 @@
   </image_path>
   <background_image>
     <rec button="normal">number_pad_btn_bg.png</rec>
+    <rec button="disabled">number_pad_btn_bg.png</rec>
   </background_image>
   <row x="0" y="1">
     <key>
@@ -45,7 +46,7 @@
     </key>
   </row>
   <row x="0">
-    <key width="119">
+    <key>
       <image_label>
         <rec button="normal">Date_time_button/privacy_lock_pad_variation_04.png</rec>
         <rec button="pressed">Date_time_button/privacy_lock_pad_variation_04.png</rec>
@@ -54,7 +55,7 @@
         <rec>4</rec>
       </key_value>
     </key>
-    <key width="120">
+    <key>
       <image_label>
         <rec button="normal">Date_time_button/privacy_lock_pad_variation_05.png</rec>
         <rec button="pressed">Date_time_button/privacy_lock_pad_variation_05.png</rec>
@@ -63,7 +64,7 @@
         <rec>5</rec>
       </key_value>
     </key>
-    <key width="119">
+    <key>
       <image_label>
         <rec button="normal">Date_time_button/privacy_lock_pad_variation_06.png</rec>
         <rec button="pressed">Date_time_button/privacy_lock_pad_variation_06.png</rec>
@@ -72,9 +73,19 @@
         <rec>6</rec>
       </key_value>
     </key>
+    <key key_type="control" custom_id="Enter" label_type="3X4_NUMBER_Done" width="90" height="119">
+      <image_label>
+        <rec button="normal">w_sip_3x4_btn_ic_enter.png</rec>
+        <rec button="pressed">w_sip_3x4_btn_ic_enter.png</rec>
+        <rec button="disabled">w_sip_3x4_btn_ic_enter_d.png</rec>
+      </image_label>
+      <key_value>
+        <rec>Enter</rec>
+      </key_value>
+    </key>
   </row>
   <row x="0">
-    <key width="119">
+    <key>
       <image_label>
         <rec button="normal">Date_time_button/privacy_lock_pad_variation_07.png</rec>
         <rec button="pressed">Date_time_button/privacy_lock_pad_variation_07.png</rec>
@@ -83,7 +94,7 @@
         <rec>7</rec>
       </key_value>
     </key>
-    <key width="120">
+    <key>
       <image_label>
         <rec button="normal">Date_time_button/privacy_lock_pad_variation_08.png</rec>
         <rec button="pressed">Date_time_button/privacy_lock_pad_variation_08.png</rec>
@@ -92,7 +103,7 @@
         <rec>8</rec>
       </key_value>
     </key>
-    <key width="119">
+    <key>
       <image_label>
         <rec button="normal">Date_time_button/privacy_lock_pad_variation_09.png</rec>
         <rec button="pressed">Date_time_button/privacy_lock_pad_variation_09.png</rec>
@@ -103,7 +114,7 @@
     </key>
   </row>
   <row x="38">
-    <key label_type="3X4_NUMBER_0" width="140">
+    <key image_label_type="3X4_NUMBER_0_1" width="284">
       <image_label>
         <rec button="normal">Privacy_button/privacy_lock_button_00.png</rec>
         <rec button="pressed">Privacy_button/privacy_lock_button_00.png</rec>
@@ -112,13 +123,5 @@
         <rec>0</rec>
       </key_value>
     </key>
-    <key key_type="control" custom_id="Enter" label_type="3X4_NUMBER_OK" width="140">
-      <label>
-        <rec>OK</rec>
-      </label>
-      <key_value>
-        <rec>Enter</rec>
-      </key_value>
-    </key>
   </row>
 </layout>
diff --git a/data/layout/wearable/LYT_PORTRAIT_3X4_MONTH.xml b/data/layout/wearable/LYT_PORTRAIT_3X4_MONTH.xml
index 7c44a90..58d13e7 100644 (file)
--- a/data/layout/wearable/LYT_PORTRAIT_3X4_MONTH.xml
+++ b/data/layout/wearable/LYT_PORTRAIT_3X4_MONTH.xml
@@ -1,126 +1,126 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<layout width="360" height="240" key_width="227" key_height="95" key_spacing="8" row_spacing="7" hit_left="4" hit_right="4" hit_top="3" hit_bottom="4" label_type="3X4_MONTH" vibe_style="DEFAULT" sound_style="DEFAULT">
+<layout width="360" height="240" key_width="89" key_height="59" key_spacing="1" row_spacing="1" vibe_style="DEFAULT" sound_style="DEFAULT" label_type="3X4_BTN_1">
   <image_path>
-    <button_normal>B09_panel.png</button_normal>
+    <button_normal>number_pad_btn_bg_bottom.png</button_normal>
   </image_path>
   <background_image>
-    <rec button="normal">button/B09_key_btn_01.png</rec>
-    <rec button="pressed">button/B09_key_btn_press.png</rec>
-    <rec button="disabled">button/B09_key_btn_01.png</rec>
+    <rec button="normal">number_pad_btn_bg.png</rec>
+    <rec button="disabled">number_pad_btn_bg.png</rec>
   </background_image>
-  <row x="54" y="13">
-    <key width="200" key_type="string" hit_left="12" hit_top="13">
-      <label>
-        <rec>1            </rec>
-        <rec multi="1">      JAN</rec>
-      </label>
+  <row x="0" y="1">
+    <key>
+      <image_label>
+        <rec button="normal">Date_time_button/privacy_lock_pad_variation_01.png</rec>
+        <rec button="pressed">Date_time_button/privacy_lock_pad_variation_01.png</rec>
+      </image_label>
       <key_value>
         <rec>1</rec>
       </key_value>
     </key>
-    <key width="200" key_type="string" hit_top="13">
-      <label>
-        <rec>2            </rec>
-        <rec multi="1">      FEB</rec>
-      </label>
+    <key>
+      <image_label>
+        <rec button="normal">Date_time_button/privacy_lock_pad_variation_02.png</rec>
+        <rec button="pressed">Date_time_button/privacy_lock_pad_variation_02.png</rec>
+      </image_label>
       <key_value>
         <rec>2</rec>
       </key_value>
     </key>
-    <key width="200" key_type="string" hit_right="12" hit_top="13">
-      <label>
-        <rec>3            </rec>
-        <rec multi="1">      MAR</rec>
-      </label>
+    <key>
+      <image_label>
+        <rec button="normal">Date_time_button/privacy_lock_pad_variation_03.png</rec>
+        <rec button="pressed">Date_time_button/privacy_lock_pad_variation_03.png</rec>
+      </image_label>
       <key_value>
         <rec>3</rec>
       </key_value>
     </key>
+    <key key_type="control" use_repeat_key="true" image_label_type="IMAGE_3X4" width="90">
+      <image_label>
+        <rec button="normal">Privacy_button/privacy_lock_button_delete.png</rec>
+        <rec button="pressed">Privacy_button/privacy_lock_button_delete.png</rec>
+      </image_label>
+      <key_value>
+        <rec>BackSpace</rec>
+      </key_value>
+    </key>
   </row>
-  <row x="95">
-    <key width="173" key_type="string" hit_left="12">
-      <label>
-        <rec>4            </rec>
-        <rec multi="1">      APR</rec>
-      </label>
+  <row x="0">
+    <key>
+      <image_label>
+        <rec button="normal">Date_time_button/privacy_lock_pad_variation_04.png</rec>
+        <rec button="pressed">Date_time_button/privacy_lock_pad_variation_04.png</rec>
+      </image_label>
       <key_value>
         <rec>4</rec>
       </key_value>
     </key>
-    <key width="173" key_type="string">
-      <label>
-        <rec>5            </rec>
-        <rec multi="1">      MAY</rec>
-      </label>
+    <key>
+      <image_label>
+        <rec button="normal">Date_time_button/privacy_lock_pad_variation_05.png</rec>
+        <rec button="pressed">Date_time_button/privacy_lock_pad_variation_05.png</rec>
+      </image_label>
       <key_value>
         <rec>5</rec>
       </key_value>
     </key>
-    <key width="173" key_type="string" hit_right="12">
-      <label>
-        <rec>6            </rec>
-        <rec multi="1">      JUN</rec>
-      </label>
+    <key>
+      <image_label>
+        <rec button="normal">Date_time_button/privacy_lock_pad_variation_06.png</rec>
+        <rec button="pressed">Date_time_button/privacy_lock_pad_variation_06.png</rec>
+      </image_label>
       <key_value>
         <rec>6</rec>
       </key_value>
     </key>
+    <key key_type="control" custom_id="Enter" label_type="3X4_NUMBER_Done" width="90" height="119">
+      <image_label>
+        <rec button="normal">w_sip_3x4_btn_ic_enter.png</rec>
+        <rec button="pressed">w_sip_3x4_btn_ic_enter.png</rec>
+        <rec button="disabled">w_sip_3x4_btn_ic_enter_d.png</rec>
+      </image_label>
+      <key_value>
+        <rec>Enter</rec>
+      </key_value>
+    </key>
   </row>
-  <row x="130">
-    <key width="147" key_type="string" hit_left="12">
-      <label>
-        <rec>7            </rec>
-        <rec multi="1">      JUL</rec>
-      </label>
+  <row x="0">
+    <key>
+      <image_label>
+        <rec button="normal">Date_time_button/privacy_lock_pad_variation_07.png</rec>
+        <rec button="pressed">Date_time_button/privacy_lock_pad_variation_07.png</rec>
+      </image_label>
       <key_value>
         <rec>7</rec>
       </key_value>
     </key>
-    <key width="147" key_type="string">
-      <label>
-        <rec>8            </rec>
-        <rec multi="1">      AUG</rec>
-      </label>
+    <key>
+      <image_label>
+        <rec button="normal">Date_time_button/privacy_lock_pad_variation_08.png</rec>
+        <rec button="pressed">Date_time_button/privacy_lock_pad_variation_08.png</rec>
+      </image_label>
       <key_value>
         <rec>8</rec>
       </key_value>
     </key>
-    <key width="147" key_type="string" hit_right="12">
-      <label>
-        <rec>9            </rec>
-        <rec multi="1">      SEP</rec>
-      </label>
+    <key>
+      <image_label>
+        <rec button="normal">Date_time_button/privacy_lock_pad_variation_09.png</rec>
+        <rec button="pressed">Date_time_button/privacy_lock_pad_variation_09.png</rec>
+      </image_label>
       <key_value>
         <rec>9</rec>
       </key_value>
     </key>
   </row>
-  <row x="210">
-    <key width="95" height="90" key_type="string" hit_left="12" hit_bottom="27">
-      <label>
-        <rec>10            </rec>
-        <rec multi="1">     OCT</rec>
-      </label>
-      <key_value>
-        <rec>10</rec>
-      </key_value>
-    </key>
-    <key width="95" height="90" key_type="string" hit_bottom="27">
-      <label>
-        <rec>11            </rec>
-        <rec multi="1">     NOV</rec>
-      </label>
-      <key_value>
-        <rec>11</rec>
-      </key_value>
-    </key>
-    <key width="95" height="90" key_type="string" hit_right="12" hit_bottom="27">
-      <label>
-        <rec>12            </rec>
-        <rec multi="1">     DEC</rec>
-      </label>
+  <row x="38">
+    <key image_label_type="3X4_NUMBER_0_1" width="284">
+      <image_label>
+        <rec button="normal">Privacy_button/privacy_lock_button_00.png</rec>
+        <rec button="pressed">Privacy_button/privacy_lock_button_00.png</rec>
+      </image_label>
       <key_value>
-        <rec>12</rec>
+        <rec>0</rec>
       </key_value>
     </key>
   </row>
diff --git a/data/layout/wearable/LYT_PORTRAIT_3X4_NUMONLY.xml b/data/layout/wearable/LYT_PORTRAIT_3X4_NUMONLY.xml
index 0987160..5813020 100644 (file)
--- a/data/layout/wearable/LYT_PORTRAIT_3X4_NUMONLY.xml
+++ b/data/layout/wearable/LYT_PORTRAIT_3X4_NUMONLY.xml
@@ -77,6 +77,7 @@
       <image_label>
         <rec button="normal">w_sip_3x4_btn_ic_enter.png</rec>
         <rec button="pressed">w_sip_3x4_btn_ic_enter.png</rec>
+        <rec button="disabled">w_sip_3x4_btn_ic_enter_d.png</rec>
       </image_label>
       <key_value>
         <rec>Enter</rec>
diff --git a/data/layout/wearable/LYT_PORTRAIT_3X4_NUMONLY_DEC.xml b/data/layout/wearable/LYT_PORTRAIT_3X4_NUMONLY_DEC.xml
index f6d31c4..1409d37 100644 (file)
--- a/data/layout/wearable/LYT_PORTRAIT_3X4_NUMONLY_DEC.xml
+++ b/data/layout/wearable/LYT_PORTRAIT_3X4_NUMONLY_DEC.xml
@@ -5,6 +5,7 @@
   </image_path>
   <background_image>
     <rec button="normal">number_pad_btn_bg.png</rec>
+    <rec button="disabled">number_pad_btn_bg.png</rec>
   </background_image>
   <row x="0" y="1">
     <key>
@@ -76,6 +77,7 @@
       <image_label>
         <rec button="normal">w_sip_3x4_btn_ic_enter.png</rec>
         <rec button="pressed">w_sip_3x4_btn_ic_enter.png</rec>
+        <rec button="disabled">w_sip_3x4_btn_ic_enter_d.png</rec>
       </image_label>
       <key_value>
         <rec>Enter</rec>
diff --git a/data/layout/wearable/LYT_PORTRAIT_3X4_NUMONLY_SIG.xml b/data/layout/wearable/LYT_PORTRAIT_3X4_NUMONLY_SIG.xml
index 9f33011..58e3eec 100644 (file)
--- a/data/layout/wearable/LYT_PORTRAIT_3X4_NUMONLY_SIG.xml
+++ b/data/layout/wearable/LYT_PORTRAIT_3X4_NUMONLY_SIG.xml
@@ -5,6 +5,7 @@
   </image_path>
   <background_image>
     <rec button="normal">number_pad_btn_bg.png</rec>
+    <rec button="disabled">number_pad_btn_bg.png</rec>
   </background_image>
   <row x="0" y="1">
     <key>
diff --git a/data/layout/wearable/LYT_PORTRAIT_3X4_NUMONLY_SIG_DEC.xml b/data/layout/wearable/LYT_PORTRAIT_3X4_NUMONLY_SIG_DEC.xml
index 56395db..c2017b3 100644 (file)
--- a/data/layout/wearable/LYT_PORTRAIT_3X4_NUMONLY_SIG_DEC.xml
+++ b/data/layout/wearable/LYT_PORTRAIT_3X4_NUMONLY_SIG_DEC.xml
@@ -5,6 +5,7 @@
   </image_path>
   <background_image>
     <rec button="normal">number_pad_btn_bg.png</rec>
+    <rec button="disabled">number_pad_btn_bg.png</rec>
   </background_image>
   <row x="0" y="1">
     <key>
@@ -76,6 +77,7 @@
       <image_label>
         <rec button="normal">w_sip_3x4_btn_ic_enter.png</rec>
         <rec button="pressed">w_sip_3x4_btn_ic_enter.png</rec>
+        <rec button="disabled">w_sip_3x4_btn_ic_enter_d.png</rec>
       </image_label>
       <key_value>
         <rec>Enter</rec>
diff --git a/data/layout/wearable/LYT_PORTRAIT_3X4_PASSWD.xml b/data/layout/wearable/LYT_PORTRAIT_3X4_PASSWD.xml
index 674d4ff..0a0c73a 100644 (file)
--- a/data/layout/wearable/LYT_PORTRAIT_3X4_PASSWD.xml
+++ b/data/layout/wearable/LYT_PORTRAIT_3X4_PASSWD.xml
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<layout width="360" height="240" key_width="89" key_height="59" key_spacing="1" row_spacing="1" vibe_style="DEFAULT" sound_style="DEFAULT" label_type="3X4_BTN_1">
+<layout width="360" height="240" key_width="86" key_height="59" key_spacing="1" row_spacing="1" vibe_style="DEFAULT" sound_style="DEFAULT" label_type="3X4_BTN_1">
   <image_path>
     <button_normal>number_pad_btn_bg_bottom.png</button_normal>
   </image_path>
   <background_image>
     <rec button="normal">number_pad_btn_bg.png</rec>
+    <rec button="disabled">number_pad_btn_bg.png</rec>
   </background_image>
   <row x="0" y="1">
-    <key>
+    <key width="105" label_type="3X4_BTN_1_0">
       <image_label>
-        <rec button="normal">Password_pin_type_button/privacy_lock_button_abc_01.png</rec>
-        <rec button="pressed">Password_pin_type_button/privacy_lock_button_abc_01.png</rec>
+        <rec button="normal">Dial_Extension/privacy_lock_dial_extension_01.png</rec>
+        <rec button="pressed">Dial_Extension/privacy_lock_dial_extension_01.png</rec>
       </image_label>
       <key_value>
         <rec>1</rec>
@@ -18,8 +19,8 @@
     </key>
     <key>
       <image_label>
-        <rec button="normal">Password_pin_type_button/privacy_lock_button_abc_02.png</rec>
-        <rec button="pressed">Password_pin_type_button/privacy_lock_button_abc_02.png</rec>
+        <rec button="normal">Dial_Extension/privacy_lock_dial_extension_02.png</rec>
+        <rec button="pressed">Dial_Extension/privacy_lock_dial_extension_02.png</rec>
       </image_label>
       <key_value>
         <rec>2</rec>
@@ -27,14 +28,14 @@
     </key>
     <key>
       <image_label>
-        <rec button="normal">Password_pin_type_button/privacy_lock_button_abc_03.png</rec>
-        <rec button="pressed">Password_pin_type_button/privacy_lock_button_abc_03.png</rec>
+        <rec button="normal">Dial_Extension/privacy_lock_dial_extension_03.png</rec>
+        <rec button="pressed">Dial_Extension/privacy_lock_dial_extension_03.png</rec>
       </image_label>
       <key_value>
         <rec>3</rec>
       </key_value>
     </key>
-    <key key_type="control" use_repeat_key="true" image_label_type="IMAGE_3X4" width="90">
+    <key key_type="control" use_repeat_key="true" image_label_type="IMAGE_3X4" width="80">
       <image_label>
         <rec button="normal">Privacy_button/privacy_lock_button_delete.png</rec>
         <rec button="pressed">Privacy_button/privacy_lock_button_delete.png</rec>
@@ -45,57 +46,67 @@
     </key>
   </row>
   <row x="0">
-    <key width="119">
+    <key width="105" label_type="3X4_BTN_1_0">
       <image_label>
-        <rec button="normal">Password_pin_type_button/privacy_lock_button_abc_04.png</rec>
-        <rec button="pressed">Password_pin_type_button/privacy_lock_button_abc_04.png</rec>
+        <rec button="normal">Dial_Extension/privacy_lock_dial_extension_04.png</rec>
+        <rec button="pressed">Dial_Extension/privacy_lock_dial_extension_04.png</rec>
       </image_label>
       <key_value>
         <rec>4</rec>
       </key_value>
     </key>
-    <key width="120">
+    <key>
       <image_label>
-        <rec button="normal">Password_pin_type_button/privacy_lock_button_abc_05.png</rec>
-        <rec button="pressed">Password_pin_type_button/privacy_lock_button_abc_05.png</rec>
+        <rec button="normal">Dial_Extension/privacy_lock_dial_extension_05.png</rec>
+        <rec button="pressed">Dial_Extension/privacy_lock_dial_extension_05.png</rec>
       </image_label>
       <key_value>
         <rec>5</rec>
       </key_value>
     </key>
-    <key width="119">
+    <key>
       <image_label>
-        <rec button="normal">Password_pin_type_button/privacy_lock_button_abc_06.png</rec>
-        <rec button="pressed">Password_pin_type_button/privacy_lock_button_abc_06.png</rec>
+        <rec button="normal">Dial_Extension/privacy_lock_dial_extension_06.png</rec>
+        <rec button="pressed">Dial_Extension/privacy_lock_dial_extension_06.png</rec>
       </image_label>
       <key_value>
         <rec>6</rec>
       </key_value>
     </key>
+    <key key_type="control" custom_id="Enter" label_type="3X4_NUMBER_Done" width="80" height="119">
+      <image_label>
+        <rec button="normal">w_sip_3x4_btn_ic_enter.png</rec>
+        <rec button="pressed">w_sip_3x4_btn_ic_enter.png</rec>
+        <rec button="disabled">w_sip_3x4_btn_ic_enter_d.png</rec>
+      </image_label>
+      <key_value>
+        <rec>Enter</rec>
+      </key_value>
+    </key>
   </row>
   <row x="0">
-    <key width="119">
+    <key width="105" label_type="3X4_BTN_1_0">
       <image_label>
-        <rec button="normal">Password_pin_type_button/privacy_lock_button_abc_07.png</rec>
-        <rec button="pressed">Password_pin_type_button/privacy_lock_button_abc_07.png</rec>
+        <rec button="normal">Dial_Extension/privacy_lock_dial_extension_07.png</rec>
+        <rec button="pressed">Dial_Extension/privacy_lock_dial_extension_07.png</rec>
       </image_label>
       <key_value>
         <rec>7</rec>
       </key_value>
     </key>
-    <key width="120">
+    <key>
       <image_label>
-        <rec button="normal">Password_pin_type_button/privacy_lock_button_abc_08.png</rec>
-        <rec button="pressed">Password_pin_type_button/privacy_lock_button_abc_08.png</rec>
+        <rec button="normal">Dial_Extension/privacy_lock_dial_extension_08.png</rec>
+        <rec button="pressed">Dial_Extension/privacy_lock_dial_extension_08.png</rec>
       </image_label>
       <key_value>
         <rec>8</rec>
       </key_value>
     </key>
-    <key width="119">
+    <key>
       <image_label>
-        <rec button="normal">Password_pin_type_button/privacy_lock_button_abc_09.png</rec>
-        <rec button="pressed">Password_pin_type_button/privacy_lock_button_abc_09.png</rec>
+        <rec button="normal">Dial_Extension/privacy_lock_dial_extension_09.png</rec>
+        <rec button="pressed">Dial_Extension/privacy_lock_dial_extension_09.png</rec>
       </image_label>
       <key_value>
         <rec>9</rec>
@@ -103,7 +114,7 @@
     </key>
   </row>
   <row x="38">
-    <key label_type="3X4_NUMBER_0" width="140">
+    <key image_label_type="3X4_NUMBER_0_1" width="284">
       <image_label>
         <rec button="normal">Privacy_button/privacy_lock_button_00.png</rec>
         <rec button="pressed">Privacy_button/privacy_lock_button_00.png</rec>
@@ -112,13 +123,7 @@
         <rec>0</rec>
       </key_value>
     </key>
-    <key key_type="control" custom_id="Enter" label_type="3X4_NUMBER_OK" width="140">
-      <label>
-        <rec>Done</rec>
-      </label>
-      <key_value>
-        <rec>Enter</rec>
-      </key_value>
+    <key>
     </key>
   </row>
 </layout>
diff --git a/data/layout/wearable/LYT_PORTRAIT_3X4_TELEPHONE.xml b/data/layout/wearable/LYT_PORTRAIT_3X4_TELEPHONE.xml
index fee2225..20fd58a 100644 (file)
--- a/data/layout/wearable/LYT_PORTRAIT_3X4_TELEPHONE.xml
+++ b/data/layout/wearable/LYT_PORTRAIT_3X4_TELEPHONE.xml
@@ -5,6 +5,7 @@
   </image_path>
   <background_image>
     <rec button="normal">number_pad_btn_bg.png</rec>
+    <rec button="disabled">number_pad_btn_bg.png</rec>
   </background_image>
   <row x="0" y="1">
     <key width="105">
@@ -130,10 +131,12 @@
         <rec>0</rec>
       </key_value>
     </key>
-    <key key_type="control" custom_id="Enter" label_type="3X4_NUMBER_+" width="140">
-      <label>
-        <rec>Done</rec>
-      </label>
+    <key key_type="control" custom_id="Enter" label_type="3X4_NUMBER_+" image_label_type="3X4_DATE_SPACE" width="140">
+      <image_label>
+        <rec button="normal">w_sip_3x4_btn_ic_enter.png</rec>
+        <rec button="pressed">w_sip_3x4_btn_ic_enter.png</rec>
+        <rec button="disabled">w_sip_3x4_btn_ic_enter_d.png</rec>
+      </image_label>
       <key_value>
         <rec>Enter</rec>
       </key_value>
diff --git a/data/layout/wearable/LYT_PORTRAIT_4X4_CHINESE.xml b/data/layout/wearable/LYT_PORTRAIT_4X4_CHINESE.xml
index 00c4ef8..f9e9146 100644 (file)
--- a/data/layout/wearable/LYT_PORTRAIT_4X4_CHINESE.xml
+++ b/data/layout/wearable/LYT_PORTRAIT_4X4_CHINESE.xml
@@ -1,446 +1,499 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<layout width="360" height="240" magnifier="true" key_width="34" key_height="50" key_spacing="0" row_spacing="0" hit_left="0" hit_right="0" hit_top="0" hit_bottom="0" label_type="QTY_DEFAULT" vibe_style="DEFAULT" sound_style="DEFAULT">
+<layout width="360" height="240" magnifier="true" key_width="68" key_height="60" vibe_style="DEFAULT" sound_style="DEFAULT" label_type="3X4_DEFAULT">
   <image_path>
     <button_normal>B09_panel.png</button_normal>
   </image_path>
   <background_image>
-    <rec button="normal">button/B09_Qwerty_btn_01.png</rec>
-    <rec button="pressed">button/B09_Qwerty_btn_press.png</rec>
-    <rec button="disabled">button/B09_Qwerty_btn_01.png</rec>
-    <rec button="normal">button/B09_Qwerty_btn_01.png</rec>
-    <rec button="pressed">button/B09_Qwerty_btn_press.png</rec>
-    <rec button="disabled">button/B09_Qwerty_btn_01.png</rec>
+    <rec button="pressed">key_btn_press.png</rec>
   </background_image>
-  <row x="10" y="0">
-    <key use_magnifier="true" longkey_magnifier="true" long_key_value="1" multitouch_type="settle_previous" hit_left="9">
+  <row x="0" sub_layout="DEFAULT">
+    <key use_magnifier="true" key_type="string" width="78">
       <label>
-        <rec auto_upper="true">q</rec>
-        <rec multi="1">1</rec>
-      </label>
-    </key>
-    <key use_magnifier="true" longkey_magnifier="true" long_key_value="2" multitouch_type="settle_previous">
-      <label>
-        <rec auto_upper="true">w</rec>
-        <rec multi="1">2</rec>
-      </label>
-    </key>
-    <key use_magnifier="true" longkey_magnifier="true" long_key_value="3" multitouch_type="settle_previous">
-      <label>
-        <rec auto_upper="true">e</rec>
-        <rec multi="1">3</rec>
-      </label>
-    </key>
-    <key use_magnifier="true" longkey_magnifier="true" long_key_value="4" multitouch_type="settle_previous">
-      <label>
-        <rec auto_upper="true">r</rec>
-        <rec multi="1">4</rec>
-      </label>
-    </key>
-    <key use_magnifier="true" longkey_magnifier="true" long_key_value="5" multitouch_type="settle_previous">
-      <label>
-        <rec auto_upper="true">t</rec>
-        <rec multi="1">5</rec>
-      </label>
-    </key>
-    <key use_magnifier="true" longkey_magnifier="true" long_key_value="6" multitouch_type="settle_previous">
-      <label>
-        <rec auto_upper="true">y</rec>
-        <rec multi="1">6</rec>
-      </label>
-    </key>
-    <key use_magnifier="true" longkey_magnifier="true" long_key_value="7" multitouch_type="settle_previous">
-      <label>
-        <rec auto_upper="true">u</rec>
-        <rec multi="1">7</rec>
+        <rec>?</rec>
       </label>
+      <key_value>
+        <rec >?</rec>
+      </key_value>
     </key>
-    <key use_magnifier="true" longkey_magnifier="true" long_key_value="8" multitouch_type="settle_previous">
+    <key use_magnifier="true" multitouch_type="settle_previous" key_type="string" button_type="multitap" popup_type="auto_popup">
       <label>
-        <rec auto_upper="true">i</rec>
-        <rec multi="1">8</rec>
+        <rec multi="0">\</rec>
+        <rec multi="1">1</rec>
       </label>
+      <key_value>
+        <rec>.</rec>
+      </key_value>
+      <auto_popup_keys>
+        <label auto_upper="true" autopopup="0">1</label>
+        <label auto_upper="true" autopopup="1">\</label>
+      </auto_popup_keys>
     </key>
-    <key use_magnifier="true" longkey_magnifier="true" long_key_value="9" multitouch_type="settle_previous">
+    <key key_type="string" button_type="multitap" popup_type="auto_popup">
       <label>
-        <rec auto_upper="true">o</rec>
-        <rec multi="1">9</rec>
+        <rec multi="0" auto_upper="true">ABC</rec>
+        <rec multi="1">2</rec>
       </label>
+      <key_value>
+        <rec auto_upper="true" multichar_state="0">a</rec>
+        <rec auto_upper="true" multichar_state="1">b</rec>
+        <rec auto_upper="true" multichar_state="2">c</rec>
+      </key_value>
+      <auto_popup_keys>
+        <label auto_upper="true" autopopup="0">2</label>
+        <label auto_upper="true" autopopup="1">a</label>
+        <label auto_upper="true" autopopup="2">b</label>
+        <label auto_upper="true" autopopup="3">c</label>
+      </auto_popup_keys>
     </key>
-    <key use_magnifier="true" longkey_magnifier="true" long_key_value="0" multitouch_type="settle_previous" hit_right="8">
+    <key key_type="string" button_type="multitap" popup_type="auto_popup">
       <label>
-        <rec auto_upper="true">p</rec>
-        <rec multi="1">0</rec>
+        <rec multi="0" auto_upper="true">DEF</rec>
+        <rec multi="1">3</rec>
       </label>
+      <key_value>
+        <rec auto_upper="true" multichar_state="0">d</rec>
+        <rec auto_upper="true" multichar_state="1">e</rec>
+        <rec auto_upper="true" multichar_state="2">f</rec>
+      </key_value>
+      <auto_popup_keys>
+        <label auto_upper="true" autopopup="0">d</label>
+        <label auto_upper="true" autopopup="1">e</label>
+        <label auto_upper="true" autopopup="2">f</label>
+        <label auto_upper="true" autopopup="3">3</label>
+      </auto_popup_keys>
+    </key>
+    <key key_type="control" use_repeat_key="true" image_label_type="IMAGE_3X4_TOP">
+      <image_label>
+        <rec button="normal">w_sip_3x4_btn_ic_delete.png</rec>
+        <rec button="pressed">w_sip_3x4_btn_ic_delete.png</rec>
+      </image_label>
+      <key_value>
+        <rec>BackSpace</rec>
+      </key_value>
     </key>
   </row>
-  <row x="25">
-    <key use_magnifier="true" longkey_magnifier="true" long_key_value="-" multitouch_type="settle_previous" hit_left="36">
-      <label>
-        <rec auto_upper="true">a</rec>
-        <rec multi="1">-</rec>
-      </label>
-    </key>
-    <key use_magnifier="true" longkey_magnifier="true" long_key_value="@" multitouch_type="settle_previous">
-      <label>
-        <rec auto_upper="true">s</rec>
-        <rec multi="1">@</rec>
-      </label>
-    </key>
-    <key use_magnifier="true" longkey_magnifier="true" long_key_value="*" multitouch_type="settle_previous">
+  <row x="20" sub_layout="URL">
+    <key key_type="string" button_type="multitap" popup_type="auto_popup">
       <label>
-        <rec auto_upper="true">d</rec>
-        <rec multi="1">*</rec>
-      </label>
-    </key>
-    <key use_magnifier="true" longkey_magnifier="true" long_key_value="^" multitouch_type="settle_previous">
-      <label>
-        <rec auto_upper="true">f</rec>
-        <rec multi="1">^</rec>
-      </label>
-    </key>
-    <key use_magnifier="true" longkey_magnifier="true" long_key_value=":" multitouch_type="settle_previous">
-      <label>
-        <rec auto_upper="true">g</rec>
-        <rec multi="1">：</rec>
-      </label>
-    </key>
-    <key use_magnifier="true" longkey_magnifier="true" long_key_value=";" multitouch_type="settle_previous">
-      <label>
-        <rec auto_upper="true">h</rec>
-        <rec multi="1">；</rec>
-      </label>
-    </key>
-    <key use_magnifier="true" longkey_magnifier="true" long_key_value="(" multitouch_type="settle_previous">
-      <label>
-        <rec auto_upper="true">j</rec>
-        <rec multi="1">（</rec>
+        <rec multi="0">./</rec>
+        <rec multi="1">1</rec>
       </label>
+      <key_value>
+        <rec multichar_state="0">.</rec>
+        <rec multichar_state="1">/</rec>
+      </key_value>
+      <auto_popup_keys>
+        <label auto_upper="true" autopopup="0">1</label>
+        <label auto_upper="true" autopopup="1">.</label>
+        <label auto_upper="true" autopopup="2">/</label>
+      </auto_popup_keys>
     </key>
-    <key use_magnifier="true" longkey_magnifier="true" long_key_value=")" multitouch_type="settle_previous">
+    <key key_type="string" button_type="multitap" popup_type="auto_popup">
       <label>
-        <rec auto_upper="true">k</rec>
-        <rec multi="1">）</rec>
+        <rec multi="0" auto_upper="true">ABC</rec>
+        <rec multi="1">2</rec>
       </label>
+      <key_value>
+        <rec auto_upper="true" multichar_state="0">a</rec>
+        <rec auto_upper="true" multichar_state="1">b</rec>
+        <rec auto_upper="true" multichar_state="2">c</rec>
+      </key_value>
+      <auto_popup_keys>
+        <label auto_upper="true" autopopup="0">2</label>
+        <label auto_upper="true" autopopup="1">a</label>
+        <label auto_upper="true" autopopup="2">b</label>
+        <label auto_upper="true" autopopup="3">c</label>
+      </auto_popup_keys>
     </key>
-    <key use_magnifier="true" longkey_magnifier="true" long_key_value="~" multitouch_type="settle_previous" hit_right="35">
+    <key key_type="string" button_type="multitap" popup_type="auto_popup">
       <label>
-        <rec auto_upper="true">l</rec>
-        <rec multi="1">~</rec>
+        <rec multi="0" auto_upper="true">DEF</rec>
+        <rec multi="1">3</rec>
       </label>
+      <key_value>
+        <rec auto_upper="true" multichar_state="0">d</rec>
+        <rec auto_upper="true" multichar_state="1">e</rec>
+        <rec auto_upper="true" multichar_state="2">f</rec>
+      </key_value>
+      <auto_popup_keys>
+        <label auto_upper="true" autopopup="0">d</label>
+        <label auto_upper="true" autopopup="1">e</label>
+        <label auto_upper="true" autopopup="2">f</label>
+        <label auto_upper="true" autopopup="3">3</label>
+      </auto_popup_keys>
+    </key>
+    <key key_type="control" use_repeat_key="true" image_label_type="IMAGE_3X4_TOP">
+      <image_label>
+        <rec button="normal">w_sip_3x4_btn_ic_delete.png</rec>
+        <rec button="pressed">w_sip_3x4_btn_ic_delete.png</rec>
+      </image_label>
+      <key_value>
+        <rec>BackSpace</rec>
+      </key_value>
     </key>
   </row>
-  <row x="25">
-    <key key_type="string" use_magnifier="true" multitouch_type="settle_previous" hit_left="36">
+  <row x="20" sub_layout="EMAIL">
+    <key key_type="string" button_type="multitap" popup_type="auto_popup">
       <label>
-        <rec>，</rec>
-      </label>
-    </key>
-    <key use_magnifier="true" longkey_magnifier="true" long_key_value="/" multitouch_type="settle_previous">
-      <label>
-        <rec auto_upper="true">z</rec>
-        <rec multi="1">/</rec>
+        <rec multi="0">@.;</rec>
+        <rec multi="1">1</rec>
       </label>
+      <key_value>
+        <rec multichar_state="0">@</rec>
+        <rec multichar_state="1">.</rec>
+        <rec multichar_state="2">;</rec>
+      </key_value>
+      <auto_popup_keys>
+        <label auto_upper="true" autopopup="0">1</label>
+        <label auto_upper="true" autopopup="1">@</label>
+        <label auto_upper="true" autopopup="2">.</label>
+        <label auto_upper="true" autopopup="3">;</label>
+      </auto_popup_keys>
     </key>
-    <key use_magnifier="true" longkey_magnifier="true" long_key_value="'" multitouch_type="settle_previous">
+    <key key_type="string" button_type="multitap" popup_type="auto_popup">
       <label>
-        <rec auto_upper="true">x</rec>
-        <rec multi="1">‘</rec>
+        <rec multi="0" auto_upper="true">ABC</rec>
+        <rec multi="1">2</rec>
       </label>
+      <key_value>
+        <rec auto_upper="true" multichar_state="0">a</rec>
+        <rec auto_upper="true" multichar_state="1">b</rec>
+        <rec auto_upper="true" multichar_state="2">c</rec>
+      </key_value>
+      <auto_popup_keys>
+        <label auto_upper="true" autopopup="0">2</label>
+        <label auto_upper="true" autopopup="1">a</label>
+        <label auto_upper="true" autopopup="2">b</label>
+        <label auto_upper="true" autopopup="3">c</label>
+      </auto_popup_keys>
     </key>
-    <key use_magnifier="true" longkey_magnifier="true" long_key_value="&quot;" multitouch_type="settle_previous">
+    <key key_type="string" button_type="multitap" popup_type="auto_popup">
       <label>
-        <rec auto_upper="true">c</rec>
-        <rec multi="1">“</rec>
+        <rec multi="0" auto_upper="true">DEF</rec>
+        <rec multi="1">3</rec>
       </label>
+      <key_value>
+        <rec auto_upper="true" multichar_state="0">d</rec>
+        <rec auto_upper="true" multichar_state="1">e</rec>
+        <rec auto_upper="true" multichar_state="2">f</rec>
+      </key_value>
+      <auto_popup_keys>
+        <label auto_upper="true" autopopup="0">d</label>
+        <label auto_upper="true" autopopup="1">e</label>
+        <label auto_upper="true" autopopup="2">f</label>
+        <label auto_upper="true" autopopup="3">3</label>
+      </auto_popup_keys>
+    </key>
+    <key key_type="control" use_repeat_key="true" image_label_type="IMAGE_3X4_TOP">
+      <image_label>
+        <rec button="normal">w_sip_3x4_btn_ic_delete.png</rec>
+        <rec button="pressed">w_sip_3x4_btn_ic_delete.png</rec>
+      </image_label>
+      <key_value>
+        <rec>BackSpace</rec>
+      </key_value>
     </key>
-    <key use_magnifier="true" longkey_magnifier="true" long_key_value="." multitouch_type="settle_previous">
+  </row>
+  <row x="0">
+ <key use_magnifier="true" key_type="string" width="78">
       <label>
-        <rec auto_upper="true">v</rec>
-        <rec multi="1">。</rec>
+        <rec>,</rec>
       </label>
+      <key_value>
+        <rec>,</rec>
+      </key_value>
     </key>
-    <key use_magnifier="true" longkey_magnifier="true" long_key_value="," multitouch_type="settle_previous">
+    <key key_type="string" button_type="multitap" popup_type="auto_popup">
       <label>
-        <rec auto_upper="true">b</rec>
-        <rec multi="1">，</rec>
+        <rec multi="0" auto_upper="true">GHI</rec>
+        <rec multi="1">4</rec>
       </label>
+      <key_value>
+        <rec auto_upper="true" multichar_state="0">g</rec>
+        <rec auto_upper="true" multichar_state="1">h</rec>
+        <rec auto_upper="true" multichar_state="2">i</rec>
+      </key_value>
+      <auto_popup_keys>
+        <label auto_upper="true" autopopup="0">4</label>
+        <label auto_upper="true" autopopup="1">g</label>
+        <label auto_upper="true" autopopup="2">h</label>
+        <label auto_upper="true" autopopup="3">i</label>
+      </auto_popup_keys>
     </key>
-    <key use_magnifier="true" longkey_magnifier="true" long_key_value="?" multitouch_type="settle_previous">
+    <key key_type="string" button_type="multitap" popup_type="auto_popup">
       <label>
-        <rec auto_upper="true">n</rec>
-        <rec multi="1">？</rec>
+        <rec multi="0" auto_upper="true">JKL</rec>
+        <rec multi="1">5</rec>
       </label>
+      <key_value>
+        <rec auto_upper="true" multichar_state="0">j</rec>
+        <rec auto_upper="true" multichar_state="1">k</rec>
+        <rec auto_upper="true" multichar_state="2">l</rec>
+      </key_value>
+      <auto_popup_keys>
+        <label auto_upper="true" autopopup="0">5</label>
+        <label auto_upper="true" autopopup="1">j</label>
+        <label auto_upper="true" autopopup="2">k</label>
+        <label auto_upper="true" autopopup="3">l</label>
+      </auto_popup_keys>
     </key>
-    <key use_magnifier="true" longkey_magnifier="true" long_key_value="!" multitouch_type="settle_previous">
+    <key key_type="string" button_type="multitap" popup_type="auto_popup">
       <label>
-        <rec auto_upper="true">m</rec>
-        <rec multi="1">！</rec>
+        <rec multi="0" auto_upper="true">MNO</rec>
+        <rec multi="1">6</rec>
       </label>
-    </key>
-    <key button_type="selfish" key_type="control" use_magnifier="true" longkey_magnifier="true" use_repeat_key="true" width="40" hit_right="8">
+      <key_value>
+        <rec auto_upper="true" multichar_state="0">m</rec>
+        <rec auto_upper="true" multichar_state="1">n</rec>
+        <rec auto_upper="true" multichar_state="2">o</rec>
+      </key_value>
+      <auto_popup_keys>
+        <label auto_upper="true" autopopup="0">m</label>
+        <label auto_upper="true" autopopup="1">n</label>
+        <label auto_upper="true" autopopup="2">o</label>
+        <label auto_upper="true" autopopup="3">6</label>
+      </auto_popup_keys>
+    </key>
+    <key key_type="control" custom_id="Enter" image_label_type="IMAGE_3X4_TOP">
       <image_label>
-        <rec button="normal">B09_icon_back_nor_54x54.png</rec>
-        <rec button="pressed">B09_icon_back_press_54x54.png</rec>
-        <rec button="disabled">B09_icon_back_dim_54x54.png</rec>
+        <rec button="normal">w_sip_3x4_btn_ic_enter.png</rec>
+        <rec button="pressed">w_sip_3x4_btn_ic_enter.png</rec>
+        <rec button="disabled">w_sip_3x4_btn_ic_enter_d.png</rec>
       </image_label>
-      <background_image>
-        <rec button="normal">button/B09_Qwerty_btn_02.png</rec>
-        <rec button="pressed">button/B09_Qwerty_btn_press.png</rec>
-        <rec button="disabled">button/B09_Qwerty_btn_02.png</rec>
-      </background_image>
       <key_value>
-        <rec>BackSpace</rec>
+        <rec>Enter</rec>
       </key_value>
     </key>
   </row>
-  <row x="60" sub_layout="DEFAULT">
-    <key button_type="selfish" key_type="modechange" label_type="QTY_?123" width="40" hit_left="9">
+  <row x="0" sub_layout="DEFAULT">
+ <key use_magnifier="true" key_type="string" width="78">
       <label>
-        <rec>?123</rec>
+        <rec>?</rec>
       </label>
-      <background_image>
-        <rec button="normal">button/B09_Qwerty_btn_02.png</rec>
-        <rec button="pressed">button/B09_Qwerty_btn_press.png</rec>
-        <rec button="disabled">button/B09_Qwerty_btn_02.png</rec>
-      </background_image>
       <key_value>
-        <rec>SYM_QTY_1</rec>
+        <rec>?</rec>
       </key_value>
     </key>
-    <key button_type="selfish" key_type="modechange" use_magnifier="false" custom_id="CM_KEY" label_type="SETTING_CUE" popup_type="longpress_popup_once" popup_offset_x="-12" popup_offset_y="-136">
+    <key key_type="string" button_type="multitap" popup_type="auto_popup">
       <label>
-        <rec>...</rec>
+        <rec multi="0" auto_upper="true">PQRS</rec>
+        <rec multi="1">7</rec>
       </label>
-      <image_label>
-        <rec button="normal">setting icon/B09_icon_setting_nor_54x54.png</rec>
-        <rec button="pressed">setting icon/B09_icon_setting_press_54x54.png</rec>
-        <rec button="disabled">setting icon/B09_icon_setting_dim_54x54.png</rec>
-      </image_label>
-      <background_image>
-        <rec button="normal">button/B09_Qwerty_btn_02.png</rec>
-        <rec button="pressed">button/B09_Qwerty_btn_press.png</rec>
-        <rec button="disabled">button/B09_Qwerty_btn_02.png</rec>
-      </background_image>
       <key_value>
-        <rec>OPTION</rec>
+        <rec auto_upper="true" multichar_state="0">p</rec>
+        <rec auto_upper="true" multichar_state="1">q</rec>
+        <rec auto_upper="true" multichar_state="2">r</rec>
+        <rec auto_upper="true" multichar_state="3">s</rec>
       </key_value>
-      <popup_input_mode_record>
-        <popup_input_mode>CM_POPUP</popup_input_mode>
-      </popup_input_mode_record>
+      <auto_popup_keys>
+        <label auto_upper="true" autopopup="0">7</label>
+        <label auto_upper="true" autopopup="1">p</label>
+        <label auto_upper="true" autopopup="2">q</label>
+        <label auto_upper="true" autopopup="3">r</label>
+        <label auto_upper="true" autopopup="4">s</label>
+      </auto_popup_keys>
     </key>
-    <key button_type="direction" key_type="control" label_type="QTY_SPACE" image_label_type="IMAGE_SPACE" width="100">
+    <key key_type="string" button_type="multitap" popup_type="auto_popup">
       <label>
-        <rec>_LANGUAGE_</rec>
+        <rec multi="0" auto_upper="true">TUV</rec>
+        <rec multi="1">8</rec>
       </label>
-      <image_label>
-        <rec button="normal">B09_icon_space_nor_73x22.png</rec>
-        <rec button="pressed">B09_icon_space_press_73x22.png</rec>
-        <rec button="disabled">B09_icon_space_dim_73x22.png</rec>
-      </image_label>
       <key_value>
-        <rec>Space</rec>
+        <rec auto_upper="true" multichar_state="0">t</rec>
+        <rec auto_upper="true" multichar_state="1">u</rec>
+        <rec auto_upper="true" multichar_state="2">v</rec>
       </key_value>
+      <auto_popup_keys>
+        <label auto_upper="true" autopopup="0">8</label>
+        <label auto_upper="true" autopopup="1">t</label>
+        <label auto_upper="true" autopopup="2">u</label>
+        <label auto_upper="true" autopopup="3">v</label>
+      </auto_popup_keys>
     </key>
-    <key key_type="string" popup_type="longpress_popup_once" label_type="QTY_DOT" image_label_type="IMAGE_CUE" popup_offset_x="-391" popup_offset_y="-254">
+    <key key_type="string" button_type="multitap" popup_type="auto_popup">
       <label>
-        <rec>。</rec>
+        <rec multi="0" auto_upper="true">WXYZ</rec>
+        <rec multi="1">9</rec>
       </label>
+      <key_value>
+        <rec auto_upper="true" multichar_state="0">w</rec>
+        <rec auto_upper="true" multichar_state="1">x</rec>
+        <rec auto_upper="true" multichar_state="2">y</rec>
+        <rec auto_upper="true" multichar_state="3">z</rec>
+      </key_value>
+      <auto_popup_keys>
+        <label auto_upper="true" autopopup="0">w</label>
+        <label auto_upper="true" autopopup="1">x</label>
+        <label auto_upper="true" autopopup="2">y</label>
+        <label auto_upper="true" autopopup="3">z</label>
+        <label auto_upper="true" autopopup="4">9</label>
+      </auto_popup_keys>
+    </key>
+    <key key_type="control" image_label_type="IMAGE_3X4_TOP">
       <image_label>
-        <rec button="normal">B09_icon_question_45x30.png</rec>
-        <rec button="pressed">B09_icon_question_45x30.png</rec>
-        <rec button="disabled">B09_icon_question_45x30.png</rec>
-      </image_label>
-      <popup_input_mode_record>
-        <popup_input_mode>PUNCTUATION_POPUP</popup_input_mode>
-      </popup_input_mode_record>
-    </key>
-    <key button_type="selfish" key_type="control" custom_id="Enter" label_type="QTY_?123" width="40" hit_right="8">
-      <image_label>
-        <rec button="normal">B09_icon_enter_nor_54x54.png</rec>
-        <rec button="pressed">B09_icon_enter_press_54x54.png</rec>
-        <rec button="disabled">B09_icon_enter_dim_54x54.png</rec>
+        <rec shift="off" button="normal">w_sip_3x4_btn_ic_shift.png</rec>
+        <rec shift="on" button="normal">w_sip_3x4_btn_ic_shift_p.png</rec>
+        <rec shift="loc" button="normal">w_sip_3x4_btn_ic_shift.png</rec>
+        <rec button="pressed">w_sip_3x4_btn_ic_shift.png</rec>
+        <rec button="disabled">w_sip_3x4_btn_ic_shift_d.png</rec>
       </image_label>
       <background_image>
-        <rec button="normal">button/B09_Qwerty_btn_02.png</rec>
-        <rec button="pressed">button/B09_Qwerty_btn_press.png</rec>
-        <rec button="disabled">button/B09_Qwerty_btn_02.png</rec>
+        <rec shift="loc" button="normal">button/B09_Qwerty_btn_doubletab.png</rec>
       </background_image>
       <key_value>
-        <rec>Enter</rec>
+        <rec>Shift</rec>
       </key_value>
     </key>
   </row>
-  <row x="9" sub_layout="URL">
-    <key button_type="selfish" key_type="modechange" label_type="QTY_?123" width="100" hit_left="9">
+  <row x="20" sub_layout="URL">
+    <key key_type="string" button_type="multitap" popup_type="auto_popup">
       <label>
-        <rec>?123</rec>
+        <rec multi="0" auto_upper="true">PQRS</rec>
+        <rec multi="1">7</rec>
       </label>
-      <background_image>
-        <rec button="normal">button/B09_Qwerty_btn_02.png</rec>
-        <rec button="pressed">button/B09_Qwerty_btn_press.png</rec>
-        <rec button="disabled">button/B09_Qwerty_btn_02.png</rec>
-      </background_image>
       <key_value>
-        <rec>SYM_QTY_1</rec>
+        <rec auto_upper="true" multichar_state="0">p</rec>
+        <rec auto_upper="true" multichar_state="1">q</rec>
+        <rec auto_upper="true" multichar_state="2">r</rec>
+        <rec auto_upper="true" multichar_state="3">s</rec>
       </key_value>
+      <auto_popup_keys>
+        <label auto_upper="true" autopopup="0">7</label>
+        <label auto_upper="true" autopopup="1">p</label>
+        <label auto_upper="true" autopopup="2">q</label>
+        <label auto_upper="true" autopopup="3">r</label>
+        <label auto_upper="true" autopopup="4">s</label>
+      </auto_popup_keys>
     </key>
-    <key button_type="selfish" key_type="modechange" use_magnifier="false" custom_id="CM_KEY" label_type="SETTING_CUE" popup_type="longpress_popup_once" popup_offset_x="-12" popup_offset_y="-136">
+    <key key_type="string" button_type="multitap" popup_type="auto_popup">
       <label>
-        <rec>...</rec>
+        <rec multi="0" auto_upper="true">TUV</rec>
+        <rec multi="1">8</rec>
       </label>
-      <image_label>
-        <rec button="normal">setting icon/B09_icon_setting_nor_54x54.png</rec>
-        <rec button="pressed">setting icon/B09_icon_setting_press_54x54.png</rec>
-        <rec button="disabled">setting icon/B09_icon_setting_dim_54x54.png</rec>
-      </image_label>
-      <background_image>
-        <rec button="normal">button/B09_Qwerty_btn_02.png</rec>
-        <rec button="pressed">button/B09_Qwerty_btn_press.png</rec>
-        <rec button="disabled">button/B09_Qwerty_btn_02.png</rec>
-      </background_image>
       <key_value>
-        <rec>OPTION</rec>
+        <rec auto_upper="true" multichar_state="0">t</rec>
+        <rec auto_upper="true" multichar_state="1">u</rec>
+        <rec auto_upper="true" multichar_state="2">v</rec>
       </key_value>
-      <popup_input_mode_record>
-        <popup_input_mode>CM_POPUP</popup_input_mode>
-      </popup_input_mode_record>
-    </key>
-    <key key_type="string" label_type="QTY_LINE1">
-      <label>
-        <rec>/</rec>
-      </label>
+      <auto_popup_keys>
+        <label auto_upper="true" autopopup="0">8</label>
+        <label auto_upper="true" autopopup="1">t</label>
+        <label auto_upper="true" autopopup="2">u</label>
+        <label auto_upper="true" autopopup="3">v</label>
+      </auto_popup_keys>
     </key>
-    <key button_type="direction" key_type="control" label_type="QTY_SPACE" image_label_type="IMAGE_SPACE" width="172">
+    <key key_type="string" button_type="multitap" popup_type="auto_popup">
       <label>
-        <rec>_LANGUAGE_</rec>
+        <rec multi="0" auto_upper="true">WXYZ</rec>
+        <rec multi="1">9</rec>
       </label>
-      <image_label>
-        <rec button="normal">B09_icon_space_nor_73x22.png</rec>
-        <rec button="pressed">B09_icon_space_press_73x22.png</rec>
-        <rec button="disabled">B09_icon_space_dim_73x22.png</rec>
-      </image_label>
       <key_value>
-        <rec>Space</rec>
+        <rec auto_upper="true" multichar_state="0">w</rec>
+        <rec auto_upper="true" multichar_state="1">x</rec>
+        <rec auto_upper="true" multichar_state="2">y</rec>
+        <rec auto_upper="true" multichar_state="3">z</rec>
       </key_value>
+      <auto_popup_keys>
+        <label auto_upper="true" autopopup="0">w</label>
+        <label auto_upper="true" autopopup="1">x</label>
+        <label auto_upper="true" autopopup="2">y</label>
+        <label auto_upper="true" autopopup="3">z</label>
+        <label auto_upper="true" autopopup="4">9</label>
+      </auto_popup_keys>
     </key>
-    <key key_type="string" label_type="QTY_LINE1">
-      <label>
-        <rec>.</rec>
-      </label>
-    </key>
-    <key key_type="string" popup_type="longpress_popup_once" label_type="QTY_WWWCOM" popup_offset_x="-318" popup_offset_y="-230" width="100">
+    <key key_type="string" popup_type="longpress_popup_once" popup_offset_x="-213" popup_offset_y="-172">
       <label>
         <rec>www.</rec>
       </label>
-      <background_image>
-        <rec button="normal">button/B09_Qwerty_btn_02.png</rec>
-        <rec button="pressed">button/B09_Qwerty_btn_press.png</rec>
-        <rec button="disabled">button/B09_Qwerty_btn_02.png</rec>
-      </background_image>
       <popup_input_mode_record>
         <popup_input_mode>URL_POPUP</popup_input_mode>
       </popup_input_mode_record>
     </key>
-    <key button_type="selfish" key_type="control" custom_id="Enter" label_type="QTY_?123" width="100" hit_right="8">
-      <image_label>
-        <rec button="normal">B09_icon_enter_nor_54x54.png</rec>
-        <rec button="pressed">B09_icon_enter_press_54x54.png</rec>
-        <rec button="disabled">B09_icon_enter_dim_54x54.png</rec>
-      </image_label>
-      <background_image>
-        <rec button="normal">button/B09_Qwerty_btn_02.png</rec>
-        <rec button="pressed">button/B09_Qwerty_btn_press.png</rec>
-        <rec button="disabled">button/B09_Qwerty_btn_02.png</rec>
-      </background_image>
-      <key_value>
-        <rec>Enter</rec>
-      </key_value>
-    </key>
   </row>
-  <row x="9" sub_layout="EMAIL">
-    <key button_type="selfish" key_type="modechange" label_type="QTY_?123" width="100" hit_left="9">
+  <row x="20" sub_layout="EMAIL">
+    <key key_type="string" button_type="multitap" popup_type="auto_popup">
       <label>
-        <rec>?123</rec>
+        <rec multi="0" auto_upper="true">PQRS</rec>
+        <rec multi="1">7</rec>
       </label>
-      <background_image>
-        <rec button="normal">button/B09_Qwerty_btn_02.png</rec>
-        <rec button="pressed">button/B09_Qwerty_btn_press.png</rec>
-        <rec button="disabled">button/B09_Qwerty_btn_02.png</rec>
-      </background_image>
       <key_value>
-        <rec>SYM_QTY_1</rec>
+        <rec auto_upper="true" multichar_state="0">p</rec>
+        <rec auto_upper="true" multichar_state="1">q</rec>
+        <rec auto_upper="true" multichar_state="2">r</rec>
+        <rec auto_upper="true" multichar_state="3">s</rec>
       </key_value>
+      <auto_popup_keys>
+        <label auto_upper="true" autopopup="0">7</label>
+        <label auto_upper="true" autopopup="1">p</label>
+        <label auto_upper="true" autopopup="2">q</label>
+        <label auto_upper="true" autopopup="3">r</label>
+        <label auto_upper="true" autopopup="4">s</label>
+      </auto_popup_keys>
     </key>
-    <key button_type="selfish" key_type="modechange" use_magnifier="false" custom_id="CM_KEY" label_type="SETTING_CUE" popup_type="longpress_popup_once" popup_offset_x="-12" popup_offset_y="-136">
+    <key key_type="string" button_type="multitap" popup_type="auto_popup">
       <label>
-        <rec>...</rec>
+        <rec multi="0" auto_upper="true">TUV</rec>
+        <rec multi="1">8</rec>
       </label>
-      <image_label>
-        <rec button="normal">setting icon/B09_icon_setting_nor_54x54.png</rec>
-        <rec button="pressed">setting icon/B09_icon_setting_press_54x54.png</rec>
-        <rec button="disabled">setting icon/B09_icon_setting_dim_54x54.png</rec>
-      </image_label>
-      <background_image>
-        <rec button="normal">button/B09_Qwerty_btn_02.png</rec>
-        <rec button="pressed">button/B09_Qwerty_btn_press.png</rec>
-        <rec button="disabled">button/B09_Qwerty_btn_02.png</rec>
-      </background_image>
       <key_value>
-        <rec>OPTION</rec>
+        <rec auto_upper="true" multichar_state="0">t</rec>
+        <rec auto_upper="true" multichar_state="1">u</rec>
+        <rec auto_upper="true" multichar_state="2">v</rec>
       </key_value>
-      <popup_input_mode_record>
-        <popup_input_mode>CM_POPUP</popup_input_mode>
-      </popup_input_mode_record>
-    </key>
-    <key key_type="string" label_type="QTY_LINE1">
-      <label>
-        <rec>@</rec>
-      </label>
+      <auto_popup_keys>
+        <label auto_upper="true" autopopup="0">8</label>
+        <label auto_upper="true" autopopup="1">t</label>
+        <label auto_upper="true" autopopup="2">u</label>
+        <label auto_upper="true" autopopup="3">v</label>
+      </auto_popup_keys>
     </key>
-    <key button_type="direction" key_type="control" label_type="QTY_SPACE" image_label_type="IMAGE_SPACE" width="172">
+    <key key_type="string" button_type="multitap" popup_type="auto_popup">
       <label>
-        <rec>_LANGUAGE_</rec>
+        <rec multi="0" auto_upper="true">WXYZ</rec>
+        <rec multi="1">9</rec>
       </label>
-      <image_label>
-        <rec button="normal">B09_icon_space_nor_73x22.png</rec>
-        <rec button="pressed">B09_icon_space_press_73x22.png</rec>
-        <rec button="disabled">B09_icon_space_dim_73x22.png</rec>
-      </image_label>
       <key_value>
-        <rec>Space</rec>
+        <rec auto_upper="true" multichar_state="0">w</rec>
+        <rec auto_upper="true" multichar_state="1">x</rec>
+        <rec auto_upper="true" multichar_state="2">y</rec>
+        <rec auto_upper="true" multichar_state="3">z</rec>
       </key_value>
+      <auto_popup_keys>
+        <label auto_upper="true" autopopup="0">w</label>
+        <label auto_upper="true" autopopup="1">x</label>
+        <label auto_upper="true" autopopup="2">y</label>
+        <label auto_upper="true" autopopup="3">z</label>
+        <label auto_upper="true" autopopup="4">9</label>
+      </auto_popup_keys>
     </key>
-    <key key_type="string" label_type="QTY_LINE1">
-      <label>
-        <rec>.</rec>
-      </label>
-    </key>
-    <key key_type="string" popup_type="longpress_popup_once" label_type="QTY_WWWCOM" popup_offset_x="-318" popup_offset_y="-230" width="100">
+    <key key_type="string" popup_type="longpress_popup_once" popup_offset_x="-213" popup_offset_y="-172">
       <label>
         <rec>.com</rec>
       </label>
-      <background_image>
-        <rec button="normal">button/B09_Qwerty_btn_02.png</rec>
-        <rec button="pressed">button/B09_Qwerty_btn_press.png</rec>
-        <rec button="disabled">button/B09_Qwerty_btn_02.png</rec>
-      </background_image>
       <popup_input_mode_record>
         <popup_input_mode>URL_POPUP</popup_input_mode>
       </popup_input_mode_record>
     </key>
-    <key button_type="selfish" key_type="control" custom_id="Enter" label_type="QTY_?123" width="100" hit_right="8">
+  </row>
+  <row x="47">
+    <key key_type="string" label_type="3X4_DEFAULT_0" width="133">
+      <label>
+        <rec>0</rec>
+      </label>
+      <key_value>
+        <rec>0</rec>
+      </key_value>
+    </key>
+    <key button_type="direction" key_type="control" custom_id="SPACE_KEY" label_type="3X4_DEFAULT_SPACE" image_label_type="IMAGE_3X4_SPACE_ARROW" width="133">
+      <label>
+        <rec>_LANGUAGE_</rec>
+      </label>
       <image_label>
-        <rec button="normal">B09_icon_enter_nor_54x54.png</rec>
-        <rec button="pressed">B09_icon_enter_press_54x54.png</rec>
-        <rec button="disabled">B09_icon_enter_dim_54x54.png</rec>
+        <rec button="normal">w_sip_3x4_btn_ic_space_arrow.png</rec>
+        <rec button="pressed">w_sip_3x4_btn_ic_space_arrow.png</rec>
       </image_label>
-      <background_image>
-        <rec button="normal">button/B09_Qwerty_btn_02.png</rec>
-        <rec button="pressed">button/B09_Qwerty_btn_press.png</rec>
-        <rec button="disabled">button/B09_Qwerty_btn_02.png</rec>
-      </background_image>
       <key_value>
-        <rec>Enter</rec>
+        <rec>Space</rec>
       </key_value>
     </key>
   </row>
diff --git a/data/layout/wearable/LYT_PORTRAIT_4X4_EMAIL.xml b/data/layout/wearable/LYT_PORTRAIT_4X4_EMAIL.xml
index 1fa9c12..79e3fe2 100644 (file)
--- a/data/layout/wearable/LYT_PORTRAIT_4X4_EMAIL.xml
+++ b/data/layout/wearable/LYT_PORTRAIT_4X4_EMAIL.xml
@@ -1,845 +1,480 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<layout width="360" height="240" magnifier="true" key_width="62" key_height="86" key_spacing="10" row_spacing="26" hit_left="5" hit_right="5" hit_top="13" hit_bottom="13" label_type="QTY_DEFAULT" vibe_style="DEFAULT" sound_style="DEFAULT">
+<layout width="360" height="240" magnifier="true" key_width="80" key_height="60" vibe_style="DEFAULT" sound_style="DEFAULT" label_type="3X4_DEFAULT">
   <image_path>
     <button_normal>B09_panel.png</button_normal>
   </image_path>
   <background_image>
-    <rec button="normal">button/B09_Qwerty_btn_01.png</rec>
-    <rec button="pressed">button/B09_Qwerty_btn_press.png</rec>
-    <rec button="disabled">button/B09_Qwerty_btn_01.png</rec>
+    <rec button="pressed">key_btn_press.png</rec>
   </background_image>
-  <row x="4" y="10">
-    <key use_magnifier="true" longkey_magnifier="true" long_key_value="1" multitouch_type="settle_previous">
+  <row x="20" sub_layout="DEFAULT">
+    <key key_type="string" button_type="multitap" popup_type="auto_popup">
       <label>
-        <rec auto_upper="true">q</rec>
+        <rec multi="0">@.:</rec>
         <rec multi="1">1</rec>
       </label>
-    </key>
-    <key use_magnifier="true" longkey_magnifier="true" long_key_value="2" multitouch_type="settle_previous">
-      <label>
-        <rec auto_upper="true">w</rec>
-        <rec multi="1">2</rec>
-      </label>
-    </key>
-    <key use_magnifier="true" multitouch_type="settle_previous" popup_type="auto_popup">
-      <label>
-        <rec auto_upper="true">e</rec>
-        <rec multi="1">3</rec>
-      </label>
-      <magnifier_label>
-        <rec multi="1">...</rec>
-      </magnifier_label>
+      <key_value>
+        <rec multichar_state="0">@</rec>
+        <rec multichar_state="1">.</rec>
+        <rec multichar_state="2">:</rec>
+      </key_value>
       <auto_popup_keys>
-        <label shift="off" autopopup="0">3</label>
-        <label shift="off" autopopup="1">è</label>
-        <label shift="off" autopopup="2">é</label>
-        <label shift="off" autopopup="3">ê</label>
-        <label shift="off" autopopup="4">ë</label>
-        <label shift="off" autopopup="5">ē</label>
-        <label shift="off" autopopup="6">ė</label>
-        <label shift="off" autopopup="7">ę</label>
-        <label shift="off" autopopup="8">ě</label>
-        <label shift="off" autopopup="9">ə</label>
-        <label shift="on" autopopup="0">3</label>
-        <label shift="on" autopopup="1">È</label>
-        <label shift="on" autopopup="2">É</label>
-        <label shift="on" autopopup="3">Ê</label>
-        <label shift="on" autopopup="4">Ë</label>
-        <label shift="on" autopopup="5">Ē</label>
-        <label shift="on" autopopup="6">Ė</label>
-        <label shift="on" autopopup="7">Ę</label>
-        <label shift="on" autopopup="8">Ě</label>
-        <label shift="on" autopopup="9">Ə</label>
-        <label shift="loc" autopopup="0">3</label>
-        <label shift="loc" autopopup="1">È</label>
-        <label shift="loc" autopopup="2">É</label>
-        <label shift="loc" autopopup="3">Ê</label>
-        <label shift="loc" autopopup="4">Ë</label>
-        <label shift="loc" autopopup="5">Ē</label>
-        <label shift="loc" autopopup="6">Ė</label>
-        <label shift="loc" autopopup="7">Ę</label>
-        <label shift="loc" autopopup="8">Ě</label>
-        <label shift="loc" autopopup="9">Ə</label>
+        <label auto_upper="true" autopopup="0">1</label>
+        <label auto_upper="true" autopopup="1">@</label>
+        <label auto_upper="true" autopopup="2">.</label>
+        <label auto_upper="true" autopopup="3">:</label>
       </auto_popup_keys>
     </key>
-    <key use_magnifier="true" multitouch_type="settle_previous" popup_type="auto_popup">
+    <key key_type="string" button_type="multitap" popup_type="auto_popup">
       <label>
-        <rec auto_upper="true">r</rec>
-        <rec multi="1">4</rec>
+        <rec multi="0" auto_upper="true">abc</rec>
+        <rec multi="1">2</rec>
       </label>
-      <magnifier_label>
-        <rec multi="1">...</rec>
-      </magnifier_label>
+      <key_value>
+        <rec auto_upper="true" multichar_state="0">a</rec>
+        <rec auto_upper="true" multichar_state="1">b</rec>
+        <rec auto_upper="true" multichar_state="2">c</rec>
+      </key_value>
       <auto_popup_keys>
-        <label shift="off" autopopup="0">4</label>
-        <label shift="off" autopopup="1">ŕ</label>
-        <label shift="off" autopopup="2">ř</label>
-        <label shift="on" autopopup="0">4</label>
-        <label shift="on" autopopup="1">Ŕ</label>
-        <label shift="on" autopopup="2">Ř</label>
-        <label shift="loc" autopopup="0">4</label>
-        <label shift="loc" autopopup="1">Ŕ</label>
-        <label shift="loc" autopopup="2">Ř</label>
+        <label auto_upper="true" autopopup="0">2</label>
+        <label auto_upper="true" autopopup="1">a</label>
+        <label auto_upper="true" autopopup="2">b</label>
+        <label auto_upper="true" autopopup="3">c</label>
       </auto_popup_keys>
     </key>
-    <key use_magnifier="true" multitouch_type="settle_previous" popup_type="auto_popup">
+    <key key_type="string" button_type="multitap" popup_type="auto_popup">
       <label>
-        <rec auto_upper="true">t</rec>
-        <rec multi="1">5</rec>
+        <rec multi="0" auto_upper="true">def</rec>
+        <rec multi="1">3</rec>
       </label>
-      <magnifier_label>
-        <rec multi="1">...</rec>
-      </magnifier_label>
+      <key_value>
+        <rec auto_upper="true" multichar_state="0">d</rec>
+        <rec auto_upper="true" multichar_state="1">e</rec>
+        <rec auto_upper="true" multichar_state="2">f</rec>
+      </key_value>
       <auto_popup_keys>
-        <label shift="off" autopopup="0">5</label>
-        <label shift="off" autopopup="1">þ</label>
-        <label shift="off" autopopup="2">ť</label>
-        <label shift="off" autopopup="3">ț</label>
-        <label shift="on" autopopup="0">5</label>
-        <label shift="on" autopopup="1">Þ</label>
-        <label shift="on" autopopup="2">Ť</label>
-        <label shift="on" autopopup="3">Ț</label>
-        <label shift="loc" autopopup="0">5</label>
-        <label shift="loc" autopopup="1">Þ</label>
-        <label shift="loc" autopopup="2">Ť</label>
-        <label shift="loc" autopopup="3">Ț</label>
+        <label auto_upper="true" autopopup="0">d</label>
+        <label auto_upper="true" autopopup="1">e</label>
+        <label auto_upper="true" autopopup="2">f</label>
+        <label auto_upper="true" autopopup="3">3</label>
       </auto_popup_keys>
     </key>
-    <key use_magnifier="true" multitouch_type="settle_previous" popup_type="auto_popup">
-      <label>
-        <rec auto_upper="true">y</rec>
-        <rec multi="1">6</rec>
-      </label>
-      <magnifier_label>
-        <rec multi="1">...</rec>
-      </magnifier_label>
-      <auto_popup_keys>
-        <label shift="off" autopopup="0">ý</label>
-        <label shift="off" autopopup="1">6</label>
-        <label shift="on" autopopup="0">Ý</label>
-        <label shift="on" autopopup="1">6</label>
-        <label shift="loc" autopopup="0">Ý</label>
-        <label shift="loc" autopopup="1">6</label>
-      </auto_popup_keys>
+    <key key_type="control" use_repeat_key="true" image_label_type="IMAGE_3X4_TOP">
+      <image_label>
+        <rec button="normal">w_sip_3x4_btn_ic_delete.png</rec>
+        <rec button="pressed">w_sip_3x4_btn_ic_delete.png</rec>
+      </image_label>
+      <key_value>
+        <rec>BackSpace</rec>
+      </key_value>
     </key>
-    <key use_magnifier="true" multitouch_type="settle_previous" popup_type="auto_popup">
+  </row>
+  <row x="20" sub_layout="URL">
+    <key key_type="string" button_type="multitap" popup_type="auto_popup">
       <label>
-        <rec auto_upper="true">u</rec>
-        <rec multi="1">7</rec>
+        <rec multi="0">./</rec>
+        <rec multi="1">1</rec>
       </label>
-      <magnifier_label>
-        <rec multi="1">...</rec>
-      </magnifier_label>
+      <key_value>
+        <rec multichar_state="0">.</rec>
+        <rec multichar_state="1">/</rec>
+      </key_value>
       <auto_popup_keys>
-        <label shift="off" autopopup="0">ü</label>
-        <label shift="off" autopopup="1">û</label>
-        <label shift="off" autopopup="2">ú</label>
-        <label shift="off" autopopup="3">ù</label>
-        <label shift="off" autopopup="4">7</label>
-        <label shift="off" autopopup="5">ų</label>
-        <label shift="off" autopopup="6">ű</label>
-        <label shift="off" autopopup="7">ů</label>
-        <label shift="off" autopopup="8">ū</label>
-        <label shift="on" autopopup="0">Ü</label>
-        <label shift="on" autopopup="1">Û</label>
-        <label shift="on" autopopup="2">Ú</label>
-        <label shift="on" autopopup="3">Ù</label>
-        <label shift="on" autopopup="4">7</label>
-        <label shift="on" autopopup="5">Ų</label>
-        <label shift="on" autopopup="6">Ű</label>
-        <label shift="on" autopopup="7">Ů</label>
-        <label shift="on" autopopup="8">Ū</label>
-        <label shift="loc" autopopup="0">Ü</label>
-        <label shift="loc" autopopup="1">Û</label>
-        <label shift="loc" autopopup="2">Ú</label>
-        <label shift="loc" autopopup="3">Ù</label>
-        <label shift="loc" autopopup="4">7</label>
-        <label shift="loc" autopopup="5">Ų</label>
-        <label shift="loc" autopopup="6">Ű</label>
-        <label shift="loc" autopopup="7">Ů</label>
-        <label shift="loc" autopopup="8">Ū</label>
+        <label auto_upper="true" autopopup="0">1</label>
+        <label auto_upper="true" autopopup="1">.</label>
+        <label auto_upper="true" autopopup="2">/</label>
       </auto_popup_keys>
     </key>
-    <key use_magnifier="true" multitouch_type="settle_previous" popup_type="auto_popup">
+    <key key_type="string" button_type="multitap" popup_type="auto_popup">
       <label>
-        <rec auto_upper="true">i</rec>
-        <rec multi="1">8</rec>
+        <rec multi="0" auto_upper="true">abc</rec>
+        <rec multi="1">2</rec>
       </label>
-      <magnifier_label>
-        <rec multi="1">...</rec>
-      </magnifier_label>
+      <key_value>
+        <rec auto_upper="true" multichar_state="0">a</rec>
+        <rec auto_upper="true" multichar_state="1">b</rec>
+        <rec auto_upper="true" multichar_state="2">c</rec>
+      </key_value>
       <auto_popup_keys>
-        <label shift="off" autopopup="0">î</label>
-        <label shift="off" autopopup="1">í</label>
-        <label shift="off" autopopup="2">ì</label>
-        <label shift="off" autopopup="3">8</label>
-        <label shift="off" autopopup="4">ı</label>
-        <label shift="off" autopopup="5">į</label>
-        <label shift="off" autopopup="6">ī</label>
-        <label shift="off" autopopup="7">ï</label>
-        <label shift="on" autopopup="0">Î</label>
-        <label shift="on" autopopup="1">Í</label>
-        <label shift="on" autopopup="2">Ì</label>
-        <label shift="on" autopopup="3">8</label>
-        <label shift="on" autopopup="4">İ</label>
-        <label shift="on" autopopup="5">Į</label>
-        <label shift="on" autopopup="6">Ī</label>
-        <label shift="on" autopopup="7">Ï</label>
-        <label shift="loc" autopopup="0">Î</label>
-        <label shift="loc" autopopup="1">Í</label>
-        <label shift="loc" autopopup="2">Ì</label>
-        <label shift="loc" autopopup="3">8</label>
-        <label shift="loc" autopopup="4">İ</label>
-        <label shift="loc" autopopup="5">Į</label>
-        <label shift="loc" autopopup="6">Ī</label>
-        <label shift="loc" autopopup="7">Ï</label>
+        <label auto_upper="true" autopopup="0">2</label>
+        <label auto_upper="true" autopopup="1">a</label>
+        <label auto_upper="true" autopopup="2">b</label>
+        <label auto_upper="true" autopopup="3">c</label>
       </auto_popup_keys>
     </key>
-    <key use_magnifier="true" multitouch_type="settle_previous" popup_type="auto_popup">
+    <key key_type="string" button_type="multitap" popup_type="auto_popup">
       <label>
-        <rec auto_upper="true">o</rec>
-        <rec multi="1">9</rec>
+        <rec multi="0" auto_upper="true">def</rec>
+        <rec multi="1">3</rec>
       </label>
-      <magnifier_label>
-        <rec multi="1">...</rec>
-      </magnifier_label>
+      <key_value>
+        <rec auto_upper="true" multichar_state="0">d</rec>
+        <rec auto_upper="true" multichar_state="1">e</rec>
+        <rec auto_upper="true" multichar_state="2">f</rec>
+      </key_value>
       <auto_popup_keys>
-        <label shift="off" autopopup="0">õ</label>
-        <label shift="off" autopopup="1">ô</label>
-        <label shift="off" autopopup="2">ó</label>
-        <label shift="off" autopopup="3">ò</label>
-        <label shift="off" autopopup="4">9</label>
-        <label shift="off" autopopup="5">œ</label>
-        <label shift="off" autopopup="6">ő</label>
-        <label shift="off" autopopup="7">ø</label>
-        <label shift="off" autopopup="8">ö</label>
-        <label shift="on" autopopup="0">Õ</label>
-        <label shift="on" autopopup="1">Ô</label>
-        <label shift="on" autopopup="2">Ó</label>
-        <label shift="on" autopopup="3">Ò</label>
-        <label shift="on" autopopup="4">9</label>
-        <label shift="on" autopopup="5">Œ</label>
-        <label shift="on" autopopup="6">Ő</label>
-        <label shift="on" autopopup="7">Ø</label>
-        <label shift="on" autopopup="8">Ö</label>
-        <label shift="loc" autopopup="0">Õ</label>
-        <label shift="loc" autopopup="1">Ô</label>
-        <label shift="loc" autopopup="2">Ó</label>
-        <label shift="loc" autopopup="3">Ò</label>
-        <label shift="loc" autopopup="4">9</label>
-        <label shift="loc" autopopup="5">Œ</label>
-        <label shift="loc" autopopup="6">Ő</label>
-        <label shift="loc" autopopup="7">Ø</label>
-        <label shift="loc" autopopup="8">Ö</label>
+        <label auto_upper="true" autopopup="0">d</label>
+        <label auto_upper="true" autopopup="1">e</label>
+        <label auto_upper="true" autopopup="2">f</label>
+        <label auto_upper="true" autopopup="3">3</label>
       </auto_popup_keys>
     </key>
-    <key use_magnifier="true" longkey_magnifier="true" long_key_value="0" multitouch_type="settle_previous" hit_right="6">
-      <label>
-        <rec auto_upper="true">p</rec>
-        <rec multi="1">0</rec>
-      </label>
+    <key key_type="control" use_repeat_key="true" image_label_type="IMAGE_3X4_TOP">
+      <image_label>
+        <rec button="normal">w_sip_3x4_btn_ic_delete.png</rec>
+        <rec button="pressed">w_sip_3x4_btn_ic_delete.png</rec>
+      </image_label>
+      <key_value>
+        <rec>BackSpace</rec>
+      </key_value>
     </key>
   </row>
-  <row x="40">
-    <key use_magnifier="true" multitouch_type="settle_previous" popup_type="auto_popup" hit_left="40">
+  <row x="20" sub_layout="EMAIL">
+    <key key_type="string" button_type="multitap" popup_type="auto_popup">
       <label>
-        <rec auto_upper="true">a</rec>
-        <rec multi="1">-</rec>
+        <rec multi="0">@.;</rec>
+        <rec multi="1">1</rec>
       </label>
-      <magnifier_label>
-        <rec multi="1">...</rec>
-      </magnifier_label>
+      <key_value>
+        <rec multichar_state="0">@</rec>
+        <rec multichar_state="1">.</rec>
+        <rec multichar_state="2">;</rec>
+      </key_value>
       <auto_popup_keys>
-        <label shift="off" autopopup="0">-</label>
-        <label shift="off" autopopup="1">à</label>
-        <label shift="off" autopopup="2">á</label>
-        <label shift="off" autopopup="3">â</label>
-        <label shift="off" autopopup="4">ã</label>
-        <label shift="off" autopopup="5">ä</label>
-        <label shift="off" autopopup="6">å</label>
-        <label shift="off" autopopup="7">æ</label>
-        <label shift="off" autopopup="8">ā</label>
-        <label shift="off" autopopup="9">ă</label>
-        <label shift="off" autopopup="10">ą</label>
-        <label shift="on" autopopup="0">-</label>
-        <label shift="on" autopopup="1">À</label>
-        <label shift="on" autopopup="2">Á</label>
-        <label shift="on" autopopup="3">Â</label>
-        <label shift="on" autopopup="4">Ã</label>
-        <label shift="on" autopopup="5">Ä</label>
-        <label shift="on" autopopup="6">Å</label>
-        <label shift="on" autopopup="7">Æ</label>
-        <label shift="on" autopopup="8">Ā</label>
-        <label shift="on" autopopup="9">Ă</label>
-        <label shift="on" autopopup="10">Ą</label>
-        <label shift="loc" autopopup="0">-</label>
-        <label shift="loc" autopopup="1">À</label>
-        <label shift="loc" autopopup="2">Á</label>
-        <label shift="loc" autopopup="3">Â</label>
-        <label shift="loc" autopopup="4">Ã</label>
-        <label shift="loc" autopopup="5">Ä</label>
-        <label shift="loc" autopopup="6">Å</label>
-        <label shift="loc" autopopup="7">Æ</label>
-        <label shift="loc" autopopup="8">Ā</label>
-        <label shift="loc" autopopup="9">Ă</label>
-        <label shift="loc" autopopup="10">Ą</label>
+        <label auto_upper="true" autopopup="0">1</label>
+        <label auto_upper="true" autopopup="1">@</label>
+        <label auto_upper="true" autopopup="2">.</label>
+        <label auto_upper="true" autopopup="3">;</label>
       </auto_popup_keys>
     </key>
-    <key use_magnifier="true" multitouch_type="settle_previous" popup_type="auto_popup">
+    <key key_type="string" button_type="multitap" popup_type="auto_popup">
       <label>
-        <rec auto_upper="true">s</rec>
-        <rec multi="1">@</rec>
+        <rec multi="0" auto_upper="true">abc</rec>
+        <rec multi="1">2</rec>
       </label>
-      <magnifier_label>
-        <rec multi="1">...</rec>
-      </magnifier_label>
+      <key_value>
+        <rec auto_upper="true" multichar_state="0">a</rec>
+        <rec auto_upper="true" multichar_state="1">b</rec>
+        <rec auto_upper="true" multichar_state="2">c</rec>
+      </key_value>
       <auto_popup_keys>
-        <label shift="off" autopopup="0">@</label>
-        <label shift="off" autopopup="1">ß</label>
-        <label shift="off" autopopup="2">ś</label>
-        <label shift="off" autopopup="3">š</label>
-        <label shift="off" autopopup="4">ş</label>
-        <label shift="on" autopopup="0">@</label>
-        <label shift="on" autopopup="1">ß</label>
-        <label shift="on" autopopup="2">Ś</label>
-        <label shift="on" autopopup="3">Š</label>
-        <label shift="on" autopopup="4">Ş</label>
-        <label shift="loc" autopopup="0">@</label>
-        <label shift="loc" autopopup="1">ß</label>
-        <label shift="loc" autopopup="2">Ś</label>
-        <label shift="loc" autopopup="3">Š</label>
-        <label shift="loc" autopopup="4">Ş</label>
+        <label auto_upper="true" autopopup="0">2</label>
+        <label auto_upper="true" autopopup="1">a</label>
+        <label auto_upper="true" autopopup="2">b</label>
+        <label auto_upper="true" autopopup="3">c</label>
       </auto_popup_keys>
     </key>
-    <key use_magnifier="true" multitouch_type="settle_previous" popup_type="auto_popup">
+    <key key_type="string" button_type="multitap" popup_type="auto_popup">
       <label>
-        <rec auto_upper="true">d</rec>
-        <rec multi="1">*</rec>
+        <rec multi="0" auto_upper="true">def</rec>
+        <rec multi="1">3</rec>
       </label>
-      <magnifier_label>
-        <rec multi="1">...</rec>
-      </magnifier_label>
+      <key_value>
+        <rec auto_upper="true" multichar_state="0">d</rec>
+        <rec auto_upper="true" multichar_state="1">e</rec>
+        <rec auto_upper="true" multichar_state="2">f</rec>
+      </key_value>
       <auto_popup_keys>
-        <label shift="off" autopopup="0">*</label>
-        <label shift="off" autopopup="1">ď</label>
-        <label shift="off" autopopup="2">đ</label>
-        <label shift="on" autopopup="0">*</label>
-        <label shift="on" autopopup="1">Ď</label>
-        <label shift="on" autopopup="2">Đ</label>
-        <label shift="loc" autopopup="0">*</label>
-        <label shift="loc" autopopup="1">Ď</label>
-        <label shift="loc" autopopup="2">Đ</label>
+        <label auto_upper="true" autopopup="0">d</label>
+        <label auto_upper="true" autopopup="1">e</label>
+        <label auto_upper="true" autopopup="2">f</label>
+        <label auto_upper="true" autopopup="3">3</label>
       </auto_popup_keys>
     </key>
-    <key use_magnifier="true" longkey_magnifier="true" long_key_value="^" multitouch_type="settle_previous">
-      <label>
-        <rec auto_upper="true">f</rec>
-        <rec multi="1">^</rec>
-      </label>
+    <key key_type="control" use_repeat_key="true" image_label_type="IMAGE_3X4_TOP">
+      <image_label>
+        <rec button="normal">w_sip_3x4_btn_ic_delete.png</rec>
+        <rec button="pressed">w_sip_3x4_btn_ic_delete.png</rec>
+      </image_label>
+      <key_value>
+        <rec>BackSpace</rec>
+      </key_value>
     </key>
-    <key use_magnifier="true" multitouch_type="settle_previous" popup_type="auto_popup">
+  </row>
+  <row x="20">
+    <key key_type="string" button_type="multitap" popup_type="auto_popup">
       <label>
-        <rec auto_upper="true">g</rec>
-        <rec multi="1">:</rec>
+        <rec multi="0" auto_upper="true">ghi</rec>
+        <rec multi="1">4</rec>
       </label>
-      <magnifier_label>
-        <rec multi="1">...</rec>
-      </magnifier_label>
+      <key_value>
+        <rec auto_upper="true" multichar_state="0">g</rec>
+        <rec auto_upper="true" multichar_state="1">h</rec>
+        <rec auto_upper="true" multichar_state="2">i</rec>
+      </key_value>
       <auto_popup_keys>
-        <label shift="off" autopopup="0">:</label>
-        <label shift="off" autopopup="1">ģ</label>
-        <label shift="off" autopopup="2">ǧ</label>
-        <label shift="on" autopopup="0">:</label>
-        <label shift="on" autopopup="1">Ģ</label>
-        <label shift="on" autopopup="2">Ǧ</label>
-        <label shift="loc" autopopup="0">:</label>
-        <label shift="loc" autopopup="1">Ģ</label>
-        <label shift="loc" autopopup="2">Ǧ</label>
+        <label auto_upper="true" autopopup="0">4</label>
+        <label auto_upper="true" autopopup="1">g</label>
+        <label auto_upper="true" autopopup="2">h</label>
+        <label auto_upper="true" autopopup="3">i</label>
       </auto_popup_keys>
     </key>
-    <key use_magnifier="true" longkey_magnifier="true" long_key_value=";" multitouch_type="settle_previous">
+    <key key_type="string" button_type="multitap" popup_type="auto_popup">
       <label>
-        <rec auto_upper="true">h</rec>
-        <rec multi="1">;</rec>
-      </label>
-    </key>
-    <key use_magnifier="true" longkey_magnifier="true" long_key_value="(" multitouch_type="settle_previous">
-      <label>
-        <rec auto_upper="true">j</rec>
-        <rec multi="1">(</rec>
-      </label>
-    </key>
-    <key use_magnifier="true" multitouch_type="settle_previous" popup_type="auto_popup">
-      <label>
-        <rec auto_upper="true">k</rec>
-        <rec multi="1">)</rec>
+        <rec multi="0" auto_upper="true">jkl</rec>
+        <rec multi="1">5</rec>
       </label>
-      <magnifier_label>
-        <rec multi="1">...</rec>
-      </magnifier_label>
+      <key_value>
+        <rec auto_upper="true" multichar_state="0">j</rec>
+        <rec auto_upper="true" multichar_state="1">k</rec>
+        <rec auto_upper="true" multichar_state="2">l</rec>
+      </key_value>
       <auto_popup_keys>
-        <label shift="off" autopopup="0">ķ</label>
-        <label shift="off" autopopup="1">)</label>
-        <label shift="on" autopopup="0">Ķ</label>
-        <label shift="on" autopopup="1">)</label>
-        <label shift="loc" autopopup="0">Ķ</label>
-        <label shift="loc" autopopup="1">)</label>
+        <label auto_upper="true" autopopup="0">5</label>
+        <label auto_upper="true" autopopup="1">j</label>
+        <label auto_upper="true" autopopup="2">k</label>
+        <label auto_upper="true" autopopup="3">l</label>
       </auto_popup_keys>
     </key>
-    <key use_magnifier="true" multitouch_type="settle_previous" popup_type="auto_popup" hit_right="42">
+    <key key_type="string" button_type="multitap" popup_type="auto_popup">
       <label>
-        <rec auto_upper="true">l</rec>
-        <rec multi="1">~</rec>
+        <rec multi="0" auto_upper="true">mno</rec>
+        <rec multi="1">6</rec>
       </label>
-      <magnifier_label>
-        <rec multi="1">...</rec>
-      </magnifier_label>
+      <key_value>
+        <rec auto_upper="true" multichar_state="0">m</rec>
+        <rec auto_upper="true" multichar_state="1">n</rec>
+        <rec auto_upper="true" multichar_state="2">o</rec>
+      </key_value>
       <auto_popup_keys>
-        <label shift="off" autopopup="0">ł</label>
-        <label shift="off" autopopup="1">ľ</label>
-        <label shift="off" autopopup="2">ļ</label>
-        <label shift="off" autopopup="3">ĺ</label>
-        <label shift="off" autopopup="4">~</label>
-        <label shift="on" autopopup="0">Ł</label>
-        <label shift="on" autopopup="1">Ľ</label>
-        <label shift="on" autopopup="2">Ļ</label>
-        <label shift="on" autopopup="3">Ĺ</label>
-        <label shift="on" autopopup="4">~</label>
-        <label shift="loc" autopopup="0">Ł</label>
-        <label shift="loc" autopopup="1">Ľ</label>
-        <label shift="loc" autopopup="2">Ļ</label>
-        <label shift="loc" autopopup="3">Ĺ</label>
-        <label shift="loc" autopopup="4">~</label>
+        <label auto_upper="true" autopopup="0">m</label>
+        <label auto_upper="true" autopopup="1">n</label>
+        <label auto_upper="true" autopopup="2">o</label>
+        <label auto_upper="true" autopopup="3">6</label>
       </auto_popup_keys>
     </key>
-  </row>
-  <row x="4">
-    <key button_type="selfish" key_type="control" key_spacing="22" width="86">
+    <key key_type="control" custom_id="Enter" image_label_type="IMAGE_3X4_TOP">
       <image_label>
-        <rec shift="off" button="normal">B09_icon_shift_50x50.png</rec>
-        <rec shift="on" button="normal">B09_icon_shift_on_50x50.png</rec>
-        <rec shift="loc" button="normal">B09_icon_shift_loc_50x50.png</rec>
-        <rec button="pressed">B09_icon_shift_50x50_press.png</rec>
-        <rec button="disabled">B09_icon_shift_50x50_dim.png</rec>
+        <rec button="normal">w_sip_3x4_btn_ic_enter.png</rec>
+        <rec button="pressed">w_sip_3x4_btn_ic_enter.png</rec>
+        <rec button="disabled">w_sip_3x4_btn_ic_enter_d.png</rec>
       </image_label>
-      <background_image>
-        <rec shift="off" button="normal">button/B09_Qwerty_btn_02.png</rec>
-        <rec shift="on" button="normal">button/B09_Qwerty_btn_02.png</rec>
-        <rec shift="loc" button="normal">button/B09_Qwerty_btn_doubletab.png</rec>
-        <rec button="pressed">button/B09_Qwerty_btn_press.png</rec>
-        <rec button="disabled">button/B09_Qwerty_btn_02.png</rec>
-      </background_image>
       <key_value>
-        <rec>Shift</rec>
+        <rec>Enter</rec>
       </key_value>
     </key>
-    <key use_magnifier="true" multitouch_type="settle_previous" popup_type="auto_popup">
+  </row>
+  <row x="20" sub_layout="DEFAULT">
+    <key key_type="string" button_type="multitap" popup_type="auto_popup">
       <label>
-        <rec auto_upper="true">z</rec>
-        <rec multi="1">/</rec>
+        <rec multi="0" auto_upper="true">pqrs</rec>
+        <rec multi="1">7</rec>
       </label>
-      <magnifier_label>
-        <rec multi="1">...</rec>
-      </magnifier_label>
+      <key_value>
+        <rec auto_upper="true" multichar_state="0">p</rec>
+        <rec auto_upper="true" multichar_state="1">q</rec>
+        <rec auto_upper="true" multichar_state="2">r</rec>
+        <rec auto_upper="true" multichar_state="3">s</rec>
+      </key_value>
       <auto_popup_keys>
-        <label shift="off" autopopup="0">/</label>
-        <label shift="off" autopopup="1">ź</label>
-        <label shift="off" autopopup="2">ż</label>
-        <label shift="off" autopopup="3">ž</label>
-        <label shift="on" autopopup="0">/</label>
-        <label shift="on" autopopup="1">Ź</label>
-        <label shift="on" autopopup="2">Ż</label>
-        <label shift="on" autopopup="3">Ž</label>
-        <label shift="loc" autopopup="0">/</label>
-        <label shift="loc" autopopup="1">Ź</label>
-        <label shift="loc" autopopup="2">Ż</label>
-        <label shift="loc" autopopup="3">Ž</label>
+        <label auto_upper="true" autopopup="0">7</label>
+        <label auto_upper="true" autopopup="1">p</label>
+        <label auto_upper="true" autopopup="2">q</label>
+        <label auto_upper="true" autopopup="3">r</label>
+        <label auto_upper="true" autopopup="4">s</label>
       </auto_popup_keys>
     </key>
-    <key use_magnifier="true" longkey_magnifier="true" long_key_value="'" multitouch_type="settle_previous">
-      <label>
-        <rec auto_upper="true">x</rec>
-        <rec multi="1">'</rec>
-      </label>
-    </key>
-    <key use_magnifier="true" multitouch_type="settle_previous" popup_type="auto_popup">
+    <key key_type="string" button_type="multitap" popup_type="auto_popup">
       <label>
-        <rec auto_upper="true">c</rec>
-        <rec multi="1">"</rec>
+        <rec multi="0" auto_upper="true">tuv</rec>
+        <rec multi="1">8</rec>
       </label>
-      <magnifier_label>
-        <rec multi="1">...</rec>
-      </magnifier_label>
+      <key_value>
+        <rec auto_upper="true" multichar_state="0">t</rec>
+        <rec auto_upper="true" multichar_state="1">u</rec>
+        <rec auto_upper="true" multichar_state="2">v</rec>
+      </key_value>
       <auto_popup_keys>
-        <label shift="off" autopopup="0">"</label>
-        <label shift="off" autopopup="1">ć</label>
-        <label shift="off" autopopup="2">č</label>
-        <label shift="off" autopopup="3">ç</label>
-        <label shift="on" autopopup="0">"</label>
-        <label shift="on" autopopup="1">Ç</label>
-        <label shift="on" autopopup="2">Ć</label>
-        <label shift="on" autopopup="3">Č</label>
-        <label shift="loc" autopopup="0">"</label>
-        <label shift="loc" autopopup="1">Ç</label>
-        <label shift="loc" autopopup="2">Ć</label>
-        <label shift="loc" autopopup="3">Č</label>
+        <label auto_upper="true" autopopup="0">8</label>
+        <label auto_upper="true" autopopup="1">t</label>
+        <label auto_upper="true" autopopup="2">u</label>
+        <label auto_upper="true" autopopup="3">v</label>
       </auto_popup_keys>
     </key>
-    <key use_magnifier="true" longkey_magnifier="true" long_key_value="." multitouch_type="settle_previous">
-      <label>
-        <rec auto_upper="true">v</rec>
-        <rec multi="1">.</rec>
-      </label>
-    </key>
-    <key use_magnifier="true" longkey_magnifier="true" long_key_value="," multitouch_type="settle_previous">
+    <key key_type="string" button_type="multitap" popup_type="auto_popup">
       <label>
-        <rec auto_upper="true">b</rec>
-        <rec multi="1">,</rec>
-      </label>
-    </key>
-    <key use_magnifier="true" multitouch_type="settle_previous" popup_type="auto_popup">
-      <label>
-        <rec auto_upper="true">n</rec>
-        <rec multi="1">?</rec>
+        <rec multi="0" auto_upper="true">wxyz</rec>
+        <rec multi="1">9</rec>
       </label>
-      <magnifier_label>
-        <rec multi="1">...</rec>
-      </magnifier_label>
+      <key_value>
+        <rec auto_upper="true" multichar_state="0">w</rec>
+        <rec auto_upper="true" multichar_state="1">x</rec>
+        <rec auto_upper="true" multichar_state="2">y</rec>
+        <rec auto_upper="true" multichar_state="3">z</rec>
+      </key_value>
       <auto_popup_keys>
-        <label shift="off" autopopup="0">ň</label>
-        <label shift="off" autopopup="1">ņ</label>
-        <label shift="off" autopopup="2">ń</label>
-        <label shift="off" autopopup="3">ñ</label>
-        <label shift="off" autopopup="4">?</label>
-        <label shift="on" autopopup="0">Ň</label>
-        <label shift="on" autopopup="1">Ņ</label>
-        <label shift="on" autopopup="2">Ń</label>
-        <label shift="on" autopopup="3">Ñ</label>
-        <label shift="on" autopopup="4">?</label>
-        <label shift="loc" autopopup="0">Ň</label>
-        <label shift="loc" autopopup="1">Ņ</label>
-        <label shift="loc" autopopup="2">Ń</label>
-        <label shift="loc" autopopup="3">Ñ</label>
-        <label shift="loc" autopopup="4">?</label>
+        <label auto_upper="true" autopopup="0">w</label>
+        <label auto_upper="true" autopopup="1">x</label>
+        <label auto_upper="true" autopopup="2">y</label>
+        <label auto_upper="true" autopopup="3">z</label>
+        <label auto_upper="true" autopopup="4">9</label>
       </auto_popup_keys>
     </key>
-    <key use_magnifier="true" longkey_magnifier="true" long_key_value="!" multitouch_type="settle_previous" key_spacing="22">
-      <label>
-        <rec auto_upper="true">m</rec>
-        <rec multi="1">!</rec>
-      </label>
-    </key>
-    <key button_type="selfish" key_type="control" use_magnifier="true" longkey_magnifier="true" hit_right="6" use_repeat_key="true" width="86">
+    <key key_type="control" image_label_type="IMAGE_3X4_TOP">
       <image_label>
-        <rec button="normal">B09_icon_back_50x50.png</rec>
-        <rec button="pressed">B09_icon_back_50x50_press.png</rec>
-        <rec button="disabled">B09_icon_back_50x50_dim.png</rec>
+        <rec shift="off" button="normal">w_sip_3x4_btn_ic_shift.png</rec>
+        <rec shift="on" button="normal">w_sip_3x4_btn_ic_shift_p.png</rec>
+        <rec shift="loc" button="normal">w_sip_3x4_btn_ic_shift.png</rec>
+        <rec button="pressed">w_sip_3x4_btn_ic_shift.png</rec>
+        <rec button="disabled">w_sip_3x4_btn_ic_shift_d.png</rec>
       </image_label>
       <background_image>
-        <rec button="normal">button/B09_Qwerty_btn_02.png</rec>
-        <rec button="pressed">button/B09_Qwerty_btn_press.png</rec>
-        <rec button="disabled">button/B09_Qwerty_btn_02.png</rec>
+        <rec shift="loc" button="normal">button/B09_Qwerty_btn_doubletab.png</rec>
       </background_image>
       <key_value>
-        <rec>BackSpace</rec>
+        <rec>Shift</rec>
       </key_value>
     </key>
   </row>
-  <row x="4" sub_layout="DEFAULT" key_width="62">
-    <key button_type="selfish" key_type="modechange" popup_type="longpress_popup_once" label_type="QTY_?123" image_label_type="IMAGE_CUE" popup_offset_y="-224" width="98">
+  <row x="20" sub_layout="URL">
+    <key key_type="string" button_type="multitap" popup_type="auto_popup">
       <label>
-        <rec>?123</rec>
+        <rec multi="0" auto_upper="true">pqrs</rec>
+        <rec multi="1">7</rec>
       </label>
-      <image_label>
-        <rec button="normal">B09_icon_cue.png</rec>
-        <rec button="pressed">B09_icon_cue.png</rec>
-        <rec button="disabled">B09_icon_cue.png</rec>
-      </image_label>
-      <background_image>
-        <rec button="normal">button/B09_Qwerty_btn_02.png</rec>
-        <rec button="pressed">button/B09_Qwerty_btn_press.png</rec>
-        <rec button="disabled">button/B09_Qwerty_btn_02.png</rec>
-      </background_image>
       <key_value>
-        <rec>SYM_QTY_1</rec>
+        <rec auto_upper="true" multichar_state="0">p</rec>
+        <rec auto_upper="true" multichar_state="1">q</rec>
+        <rec auto_upper="true" multichar_state="2">r</rec>
+        <rec auto_upper="true" multichar_state="3">s</rec>
       </key_value>
-      <popup_input_mode_record>
-        <popup_input_mode>EMOTICON_POPUP</popup_input_mode>
-      </popup_input_mode_record>
+      <auto_popup_keys>
+        <label auto_upper="true" autopopup="0">7</label>
+        <label auto_upper="true" autopopup="1">p</label>
+        <label auto_upper="true" autopopup="2">q</label>
+        <label auto_upper="true" autopopup="3">r</label>
+        <label auto_upper="true" autopopup="4">s</label>
+      </auto_popup_keys>
     </key>
-    <key button_type="selfish" key_type="user" key_spacing="22">
-      <image_label>
-        <rec button="normal">setting icon/B09_icon_setting_50x50.png</rec>
-        <rec button="pressed">setting icon/B09_icon_setting_50x50_press.png</rec>
-        <rec button="disabled">setting icon/B09_icon_setting_50x50_dim.png</rec>
-      </image_label>
-      <background_image>
-        <rec button="normal">button/B09_Qwerty_btn_02.png</rec>
-        <rec button="pressed">button/B09_Qwerty_btn_press.png</rec>
-        <rec button="disabled">button/B09_Qwerty_btn_02.png</rec>
-      </background_image>
+    <key key_type="string" button_type="multitap" popup_type="auto_popup">
+      <label>
+        <rec multi="0" auto_upper="true">tuv</rec>
+        <rec multi="1">8</rec>
+      </label>
       <key_value>
-        <rec>OPTION</rec>
+        <rec auto_upper="true" multichar_state="0">t</rec>
+        <rec auto_upper="true" multichar_state="1">u</rec>
+        <rec auto_upper="true" multichar_state="2">v</rec>
       </key_value>
+      <auto_popup_keys>
+        <label auto_upper="true" autopopup="0">8</label>
+        <label auto_upper="true" autopopup="1">t</label>
+        <label auto_upper="true" autopopup="2">u</label>
+        <label auto_upper="true" autopopup="3">v</label>
+      </auto_popup_keys>
     </key>
-    <key button_type="direction" key_type="control" hit_left="17" hit_right="17" key_spacing="22" label_type="QTY_SPACE" image_label_type="IMAGE_SPACE" width="326">
+    <key key_type="string" button_type="multitap" popup_type="auto_popup">
       <label>
-        <rec>English (US)</rec>
+        <rec multi="0" auto_upper="true">wxyz</rec>
+        <rec multi="1">9</rec>
       </label>
-      <image_label>
-        <rec button="normal">B09_icon_space.png</rec>
-        <rec button="pressed">B09_icon_space_press.png</rec>
-        <rec button="disabled">B09_icon_space_dim.png</rec>
-      </image_label>
-      <background_image>
-        <rec button="normal">button/B09_Qwerty_btn_02.png</rec>
-        <rec button="pressed">button/B09_Qwerty_btn_press.png</rec>
-        <rec button="disabled">button/B09_Qwerty_btn_02.png</rec>
-      </background_image>
       <key_value>
-        <rec>Space</rec>
+        <rec auto_upper="true" multichar_state="0">w</rec>
+        <rec auto_upper="true" multichar_state="1">x</rec>
+        <rec auto_upper="true" multichar_state="2">y</rec>
+        <rec auto_upper="true" multichar_state="3">z</rec>
       </key_value>
+      <auto_popup_keys>
+        <label auto_upper="true" autopopup="0">w</label>
+        <label auto_upper="true" autopopup="1">x</label>
+        <label auto_upper="true" autopopup="2">y</label>
+        <label auto_upper="true" autopopup="3">z</label>
+        <label auto_upper="true" autopopup="4">9</label>
+      </auto_popup_keys>
     </key>
-    <key key_type="string" popup_type="longpress_popup_once" label_type="QTY_DOT" image_label_type="IMAGE_CUE" popup_offset_x="-472" popup_offset_y="-326">
+    <key key_type="string" popup_type="longpress_popup_once" popup_offset_x="-213" popup_offset_y="-172">
       <label>
-        <rec>.</rec>
+        <rec>www.</rec>
       </label>
-      <image_label>
-        <rec button="normal">B09_icon_cue.png</rec>
-        <rec button="pressed">B09_icon_cue.png</rec>
-        <rec button="disabled">B09_icon_cue.png</rec>
-      </image_label>
-      <background_image>
-        <rec button="normal">button/B09_Qwerty_btn_02.png</rec>
-        <rec button="pressed">button/B09_Qwerty_btn_press.png</rec>
-        <rec button="disabled">button/B09_Qwerty_btn_02.png</rec>
-      </background_image>
       <popup_input_mode_record>
-        <popup_input_mode>PUNCTUATION_POPUP</popup_input_mode>
+        <popup_input_mode>URL_POPUP</popup_input_mode>
       </popup_input_mode_record>
     </key>
-    <key button_type="selfish" key_type="control" custom_id="Enter" hit_right="6" label_type="QTY_?123" width="98">
-      <image_label>
-        <rec button="normal">B09_icon_enter_50x50.png</rec>
-        <rec button="pressed">B09_icon_enter_50x50_press.png</rec>
-        <rec button="disabled">B09_icon_enter_50x50_dim.png</rec>
-      </image_label>
-      <background_image>
-        <rec button="normal">button/B09_Qwerty_btn_02.png</rec>
-        <rec button="pressed">button/B09_Qwerty_btn_press.png</rec>
-        <rec button="disabled">button/B09_Qwerty_btn_02.png</rec>
-      </background_image>
-      <key_value>
-        <rec>Enter</rec>
-      </key_value>
-    </key>
   </row>
-  <row x="4" sub_layout="URL" key_width="62">
-    <key button_type="selfish" key_type="modechange" popup_type="longpress_popup_once" label_type="QTY_?123" image_label_type="IMAGE_CUE" popup_offset_y="-224" width="98">
+  <row x="20" sub_layout="EMAIL">
+    <key key_type="string" button_type="multitap" popup_type="auto_popup">
       <label>
-        <rec>?123</rec>
+        <rec multi="0" auto_upper="true">pqrs</rec>
+        <rec multi="1">7</rec>
       </label>
-      <image_label>
-        <rec button="normal">B09_icon_cue.png</rec>
-        <rec button="pressed">B09_icon_cue.png</rec>
-        <rec button="disabled">B09_icon_cue.png</rec>
-      </image_label>
-      <background_image>
-        <rec button="normal">button/B09_Qwerty_btn_02.png</rec>
-        <rec button="pressed">button/B09_Qwerty_btn_press.png</rec>
-        <rec button="disabled">button/B09_Qwerty_btn_02.png</rec>
-      </background_image>
       <key_value>
-        <rec>SYM_QTY_1</rec>
-      </key_value>
-      <popup_input_mode_record>
-        <popup_input_mode>EMOTICON_POPUP</popup_input_mode>
-      </popup_input_mode_record>
-    </key>
-    <key button_type="selfish" key_type="user" key_spacing="22">
-      <image_label>
-        <rec button="normal">setting icon/B09_icon_setting_50x50.png</rec>
-        <rec button="pressed">setting icon/B09_icon_setting_50x50_press.png</rec>
-        <rec button="disabled">setting icon/B09_icon_setting_50x50_dim.png</rec>
-      </image_label>
-      <background_image>
-        <rec button="normal">button/B09_Qwerty_btn_02.png</rec>
-        <rec button="pressed">button/B09_Qwerty_btn_press.png</rec>
-        <rec button="disabled">button/B09_Qwerty_btn_02.png</rec>
-      </background_image>
-      <key_value>
-        <rec>OPTION</rec>
+        <rec auto_upper="true" multichar_state="0">p</rec>
+        <rec auto_upper="true" multichar_state="1">q</rec>
+        <rec auto_upper="true" multichar_state="2">r</rec>
+        <rec auto_upper="true" multichar_state="3">s</rec>
       </key_value>
+      <auto_popup_keys>
+        <label auto_upper="true" autopopup="0">7</label>
+        <label auto_upper="true" autopopup="1">p</label>
+        <label auto_upper="true" autopopup="2">q</label>
+        <label auto_upper="true" autopopup="3">r</label>
+        <label auto_upper="true" autopopup="4">s</label>
+      </auto_popup_keys>
     </key>
-    <key button_type="direction" key_type="control" hit_left="17" hit_right="17" key_spacing="22" label_type="QTY_SPACE" image_label_type="IMAGE_SPACE" width="144">
+    <key key_type="string" button_type="multitap" popup_type="auto_popup">
       <label>
-        <rec>English (US)</rec>
+        <rec multi="0" auto_upper="true">tuv</rec>
+        <rec multi="1">8</rec>
       </label>
-      <image_label>
-        <rec button="normal">B09_icon_space.png</rec>
-        <rec button="pressed">B09_icon_space_press.png</rec>
-        <rec button="disabled">B09_icon_space_dim.png</rec>
-      </image_label>
-      <background_image>
-        <rec button="normal">button/B09_Qwerty_btn_02.png</rec>
-        <rec button="pressed">button/B09_Qwerty_btn_press.png</rec>
-        <rec button="disabled">button/B09_Qwerty_btn_02.png</rec>
-      </background_image>
       <key_value>
-        <rec>Space</rec>
+        <rec auto_upper="true" multichar_state="0">t</rec>
+        <rec auto_upper="true" multichar_state="1">u</rec>
+        <rec auto_upper="true" multichar_state="2">v</rec>
       </key_value>
+      <auto_popup_keys>
+        <label auto_upper="true" autopopup="0">8</label>
+        <label auto_upper="true" autopopup="1">t</label>
+        <label auto_upper="true" autopopup="2">u</label>
+        <label auto_upper="true" autopopup="3">v</label>
+      </auto_popup_keys>
     </key>
-    <key key_type="string" label_type="QTY_ATSLASH">
-      <label>
-        <rec>@</rec>
-      </label>
-      <background_image>
-        <rec button="normal">button/B09_Qwerty_btn_02.png</rec>
-        <rec button="pressed">button/B09_Qwerty_btn_press.png</rec>
-        <rec button="disabled">button/B09_Qwerty_btn_02.png</rec>
-      </background_image>
-    </key>
-    <key key_type="string" label_type="QTY_DOT">
+    <key key_type="string" button_type="multitap" popup_type="auto_popup">
       <label>
-        <rec>.</rec>
+        <rec multi="0" auto_upper="true">wxyz</rec>
+        <rec multi="1">9</rec>
       </label>
-      <background_image>
-        <rec button="normal">button/B09_Qwerty_btn_02.png</rec>
-        <rec button="pressed">button/B09_Qwerty_btn_press.png</rec>
-        <rec button="disabled">button/B09_Qwerty_btn_02.png</rec>
-      </background_image>
+      <key_value>
+        <rec auto_upper="true" multichar_state="0">w</rec>
+        <rec auto_upper="true" multichar_state="1">x</rec>
+        <rec auto_upper="true" multichar_state="2">y</rec>
+        <rec auto_upper="true" multichar_state="3">z</rec>
+      </key_value>
+      <auto_popup_keys>
+        <label auto_upper="true" autopopup="0">w</label>
+        <label auto_upper="true" autopopup="1">x</label>
+        <label auto_upper="true" autopopup="2">y</label>
+        <label auto_upper="true" autopopup="3">z</label>
+        <label auto_upper="true" autopopup="4">9</label>
+      </auto_popup_keys>
     </key>
-    <key key_type="string" popup_type="longpress_popup_once" label_type="QTY_WWWCOM" popup_offset_x="-100" popup_offset_y="-264" width="100">
+    <key key_type="string" popup_type="longpress_popup_once" popup_offset_x="-213" popup_offset_y="-172">
       <label>
-        <rec>www.</rec>
+        <rec>.com</rec>
       </label>
-      <background_image>
-        <rec button="normal">button/B09_Qwerty_btn_02.png</rec>
-        <rec button="pressed">button/B09_Qwerty_btn_press.png</rec>
-        <rec button="disabled">button/B09_Qwerty_btn_02.png</rec>
-      </background_image>
       <popup_input_mode_record>
         <popup_input_mode>URL_POPUP</popup_input_mode>
       </popup_input_mode_record>
     </key>
-    <key button_type="selfish" key_type="control" custom_id="Enter" hit_right="6" label_type="QTY_?123" width="98">
-      <image_label>
-        <rec button="normal">B09_icon_enter_50x50.png</rec>
-        <rec button="pressed">B09_icon_enter_50x50_press.png</rec>
-        <rec button="disabled">B09_icon_enter_50x50_dim.png</rec>
-      </image_label>
-      <background_image>
-        <rec button="normal">button/B09_Qwerty_btn_02.png</rec>
-        <rec button="pressed">button/B09_Qwerty_btn_press.png</rec>
-        <rec button="disabled">button/B09_Qwerty_btn_02.png</rec>
-      </background_image>
-      <key_value>
-        <rec>Enter</rec>
-      </key_value>
-    </key>
   </row>
-  <row x="4" sub_layout="EMAIL" key_width="62">
-    <key button_type="selfish" key_type="modechange" popup_type="longpress_popup_once" label_type="QTY_?123" image_label_type="IMAGE_CUE" popup_offset_y="-224" width="98">
+  <row x="47">
+    <key key_type="string" label_type="3X4_DEFAULT_0" width="133">
       <label>
-        <rec>?123</rec>
+        <rec>0</rec>
       </label>
-      <image_label>
-        <rec button="normal">B09_icon_cue.png</rec>
-        <rec button="pressed">B09_icon_cue.png</rec>
-        <rec button="disabled">B09_icon_cue.png</rec>
-      </image_label>
-      <background_image>
-        <rec button="normal">button/B09_Qwerty_btn_02.png</rec>
-        <rec button="pressed">button/B09_Qwerty_btn_press.png</rec>
-        <rec button="disabled">button/B09_Qwerty_btn_02.png</rec>
-      </background_image>
-      <key_value>
-        <rec>SYM_QTY_1</rec>
-      </key_value>
-      <popup_input_mode_record>
-        <popup_input_mode>EMOTICON_POPUP</popup_input_mode>
-      </popup_input_mode_record>
-    </key>
-    <key button_type="selfish" key_type="user" key_spacing="22">
-      <image_label>
-        <rec button="normal">setting icon/B09_icon_setting_50x50.png</rec>
-        <rec button="pressed">setting icon/B09_icon_setting_50x50_press.png</rec>
-        <rec button="disabled">setting icon/B09_icon_setting_50x50_dim.png</rec>
-      </image_label>
-      <background_image>
-        <rec button="normal">button/B09_Qwerty_btn_02.png</rec>
-        <rec button="pressed">button/B09_Qwerty_btn_press.png</rec>
-        <rec button="disabled">button/B09_Qwerty_btn_02.png</rec>
-      </background_image>
       <key_value>
-        <rec>OPTION</rec>
+        <rec>0</rec>
       </key_value>
     </key>
-    <key button_type="direction" key_type="control" hit_left="17" hit_right="17" key_spacing="22" label_type="QTY_SPACE" image_label_type="IMAGE_SPACE" width="144">
+    <key button_type="direction" key_type="control" custom_id="SPACE_KEY" label_type="3X4_DEFAULT_SPACE" image_label_type="IMAGE_3X4_SPACE_ARROW" width="133">
       <label>
-        <rec>English (US)</rec>
+        <rec>_LANGUAGE_</rec>
       </label>
       <image_label>
-        <rec button="normal">B09_icon_space.png</rec>
-        <rec button="pressed">B09_icon_space_press.png</rec>
-        <rec button="disabled">B09_icon_space_dim.png</rec>
+        <rec button="normal">w_sip_3x4_btn_ic_space_arrow.png</rec>
+        <rec button="pressed">w_sip_3x4_btn_ic_space_arrow.png</rec>
       </image_label>
-      <background_image>
-        <rec button="normal">button/B09_Qwerty_btn_02.png</rec>
-        <rec button="pressed">button/B09_Qwerty_btn_press.png</rec>
-        <rec button="disabled">button/B09_Qwerty_btn_02.png</rec>
-      </background_image>
       <key_value>
         <rec>Space</rec>
       </key_value>
     </key>
-    <key key_type="string" label_type="QTY_ATSLASH">
-      <label>
-        <rec>@</rec>
-      </label>
-      <background_image>
-        <rec button="normal">button/B09_Qwerty_btn_02.png</rec>
-        <rec button="pressed">button/B09_Qwerty_btn_press.png</rec>
-        <rec button="disabled">button/B09_Qwerty_btn_02.png</rec>
-      </background_image>
-    </key>
-    <key key_type="string" label_type="QTY_DOT">
-      <label>
-        <rec>.</rec>
-      </label>
-      <background_image>
-        <rec button="normal">button/B09_Qwerty_btn_02.png</rec>
-        <rec button="pressed">button/B09_Qwerty_btn_press.png</rec>
-        <rec button="disabled">button/B09_Qwerty_btn_02.png</rec>
-      </background_image>
-    </key>
-    <key key_type="string" popup_type="longpress_popup_once" label_type="QTY_WWWCOM" popup_offset_x="-100" popup_offset_y="-264" width="100">
-      <label>
-        <rec>.com</rec>
-      </label>
-      <background_image>
-        <rec button="normal">button/B09_Qwerty_btn_02.png</rec>
-        <rec button="pressed">button/B09_Qwerty_btn_press.png</rec>
-        <rec button="disabled">button/B09_Qwerty_btn_02.png</rec>
-      </background_image>
-      <popup_input_mode_record>
-        <popup_input_mode>URL_POPUP</popup_input_mode>
-      </popup_input_mode_record>
-    </key>
-    <key button_type="selfish" key_type="control" custom_id="Enter" hit_right="6" label_type="QTY_?123" width="98">
-      <image_label>
-        <rec button="normal">B09_icon_enter_50x50.png</rec>
-        <rec button="pressed">B09_icon_enter_50x50_press.png</rec>
-        <rec button="disabled">B09_icon_enter_50x50_dim.png</rec>
-      </image_label>
-      <background_image>
-        <rec button="normal">button/B09_Qwerty_btn_02.png</rec>
-        <rec button="pressed">button/B09_Qwerty_btn_press.png</rec>
-        <rec button="disabled">button/B09_Qwerty_btn_02.png</rec>
-      </background_image>
-      <key_value>
-        <rec>Enter</rec>
-      </key_value>
-    </key>
   </row>
 </layout>
diff --git a/data/layout/wearable/LYT_PORTRAIT_4X4_ENGLISH.xml b/data/layout/wearable/LYT_PORTRAIT_4X4_ENGLISH.xml
index d7cee68..e05e53f 100644 (file)
--- a/data/layout/wearable/LYT_PORTRAIT_4X4_ENGLISH.xml
+++ b/data/layout/wearable/LYT_PORTRAIT_4X4_ENGLISH.xml
@@ -7,7 +7,7 @@
     <rec button="pressed">key_btn_press.png</rec>
   </background_image>
   <row x="20" sub_layout="DEFAULT">
-    <key key_type="string" button_type="multitap" popup_type="auto_popup">
+    <key use_magnifier="true" multitouch_type="settle_previous" key_type="string" button_type="multitap" popup_type="auto_popup">
       <label>
         <rec multi="0">.,?!</rec>
         <rec multi="1">1</rec>
diff --git a/data/layout/wearable/LYT_PORTRAIT_STT.xml b/data/layout/wearable/LYT_PORTRAIT_STT.xml
index 4216866..1dd32e3 100644 (file)
--- a/data/layout/wearable/LYT_PORTRAIT_STT.xml
+++ b/data/layout/wearable/LYT_PORTRAIT_STT.xml
@@ -6,31 +6,8 @@
   <background_image>
     <rec button="pressed">key_btn_press.png</rec>
   </background_image>
-  <row x="226" y="13">
-    <key key_type="control" use_repeat_key="true" image_label_type="IMAGE_3X4">
-      <image_label>
-        <rec button="normal">w_sip_3x4_btn_ic_delete.png</rec>
-        <rec button="pressed">w_sip_3x4_btn_ic_delete.png</rec>
-      </image_label>
-      <key_value>
-        <rec>BackSpace</rec>
-      </key_value>
-    </key>
-  </row>
-  <row x="226">
-    <key key_type="control" custom_id="Enter">
-      <image_label>
-        <rec button="normal">w_sip_3x4_btn_ic_enter.png</rec>
-        <rec button="pressed">w_sip_3x4_btn_ic_enter.png</rec>
-        <rec button="disabled">w_sip_3x4_btn_ic_enter_d.png</rec>
-      </image_label>
-      <key_value>
-        <rec>Enter</rec>
-      </key_value>
-    </key>
-  </row>
-  <row x="49" y="41">
-    <key key_type="modechange" image_label_type="IMAGE_3X4">
+  <row x="45" y="46">
+    <key key_type="modechange" image_label_type="IMAGE_3X4" key_spacing="44">
       <image_label>
         <rec button="normal">b_stt_language_icon.png</rec>
         <rec button="pressed">b_stt_language_icon.png</rec>
@@ -39,14 +16,21 @@
         <rec>LANGUAGE</rec>
       </key_value>
     </key>
-  </row>
-  <row x="180" y="35">
-    <key button_type="uiitem" width="1" height="81">
+    <key button_type="uiitem" width="2" height="60" key_spacing="44">
       <background_image>
         <rec button="normal">b_stt_center_line.png</rec>
         <rec button="pressed">b_stt_center_line.png</rec>
         <rec button="disabled">b_stt_center_line.png</rec>
       </background_image>
     </key>
+     <key key_type="control" use_repeat_key="true" image_label_type="IMAGE_3X4">
+      <image_label>
+        <rec button="normal">w_sip_3x4_btn_ic_delete.png</rec>
+        <rec button="pressed">w_sip_3x4_btn_ic_delete.png</rec>
+      </image_label>
+      <key_value>
+        <rec>BackSpace</rec>
+      </key_value>
+    </key>
   </row>
-</layout>
+</layout>
\ No newline at end of file
diff --git a/data/layout/wearable/autopopup_configure.xml b/data/layout/wearable/autopopup_configure.xml
index f3847dd..cae0efc 100644 (file)
--- a/data/layout/wearable/autopopup_configure.xml
+++ b/data/layout/wearable/autopopup_configure.xml
@@ -23,10 +23,10 @@
   <sw_button_style>0</sw_button_style>
   <button_size>
     <width>41</width>
-    <height>74</height>
+    <height>54</height>
   </button_size>
   <button_spacing>2</button_spacing>
-  <label_type>AUTOPOPUP</label_type >
+  <label_type>AUTOPOPUP</label_type>
   <window_decorator size="0">
     <image direction="top_left"></image>
     <image direction="top_center"></image>
diff --git a/data/layout/wearable/label_property.xml b/data/layout/wearable/label_property.xml
index 8f81c75..6a13ffa 100644 (file)
--- a/data/layout/wearable/label_property.xml
+++ b/data/layout/wearable/label_property.xml
@@ -161,6 +161,15 @@
       </font_color_record>
     </label_properties>
   </label_properties_table>
+  <label_properties_table label_type="3X4_DEFAULT_wxyz">
+    <label_properties font_name="Tizen:style=regular" font_size="16" label_alignment="center_top" padding_X="0" padding_Y="7" inner_width="50" inner_height="32">
+      <font_color_record>
+        <color button="normal">0xfafafaff</color>
+        <color button="pressed">0xfafafa7f</color>
+        <color button="disabled">0xfafafa66</color>
+      </font_color_record>
+    </label_properties>
+  </label_properties_table>
   <label_properties_table label_type="3X4_NUM">
     <label_properties font_name="Tizen:style=medium" font_size="31" label_alignment="center_top" padding_X="0" padding_Y="2" inner_width="66" inner_height="41">
       <font_color_record>
@@ -213,6 +222,15 @@
       </font_color_record>
     </label_properties>
   </label_properties_table>
+<label_properties_table label_type="3X4_NUMBER_0_1">
+    <label_properties font_name="Tizen:style=medium" font_size="26" label_alignment="center-middle" padding_X="49" padding_Y="0">
+      <font_color_record>
+        <color button="normal">0xfafafaff</color>
+        <color button="pressed">0xfafafa7f</color>
+        <color button="disabled">0xfafafa66</color>
+      </font_color_record>
+    </label_properties>
+  </label_properties_table>
   <label_properties_table label_type="3X4_NUMBER_OK">
     <label_properties font_name="Tizen:style=medium" font_size="26" label_alignment="left_middle" padding_X="15" padding_Y="0">
       <font_color_record>
@@ -231,6 +249,24 @@
       </font_color_record>
     </label_properties>
   </label_properties_table>
+  <label_properties_table label_type="3X4_NUMBER_Done">
+    <label_properties font_name="Tizen:style=regular" font_size="24" label_alignment="center_top"  padding_Y="15">
+      <font_color_record>
+        <color button="normal">0xfafafaff</color>
+        <color button="pressed">0xfafafa7f</color>
+        <color button="disabled">0xfafafa66</color>
+      </font_color_record>
+    </label_properties>
+  </label_properties_table>
+  <label_properties_table label_type="3X4_DATE_SPACE">
+    <label_properties font_name="Tizen:style=regular" font_size="25" label_alignment="left_middle" padding_X="24" inner_width="32" inner_height="32">
+      <font_color_record>
+        <color button="normal">0xfafafaff</color>
+        <color button="pressed">0xfafafa7f</color>
+        <color button="disabled">0xfafafa66</color>
+      </font_color_record>
+    </label_properties>
+  </label_properties_table>
   <label_properties_table label_type="3X4_PHONE">
     <label_properties font_name="Tizen:style=medium" font_size="25" label_alignment="center_middle" padding_X="0" padding_Y="0">
       <font_color_record>
@@ -288,6 +324,15 @@
       </font_color_record>
     </label_properties>
   </label_properties_table>
+<label_properties_table label_type="3X4_BTN_1_0">
+    <label_properties font_name="Tizen:style=Regular" font_size="26" label_alignment="right_middle" padding_X="0" padding_Y="0">
+      <font_color_record>
+        <color button="normal">0xfafafaff</color>
+        <color button="pressed">0xfafafa7f</color>
+        <color button="disabled">0xfafafa66</color>
+      </font_color_record>
+    </label_properties>
+  </label_properties_table>
   <label_properties_table label_type="3X4_BTN_SYM">
     <label_properties font_name="Tizen:style=Regular" font_size="31" label_alignment="center_middle" padding_X="0" padding_Y="0">
       <font_color_record>
@@ -522,16 +567,16 @@
     </label_properties>
   </label_properties_table>
   <label_properties_table label_type="AUTOPOPUP">
-    <label_properties font_name="Tizen:style=Regular" font_size="37" label_alignment="center_middle" padding_X="0" padding_Y="0">
+    <label_properties font_name="Tizen:style=Regular" font_size="37" label_alignment="center_bottom" padding_X="0" padding_Y="0">
       <font_color_record>
-        <color button="normal">0x171717ff</color>
-        <color button="pressed">0x171717ff</color>
-        <color button="disabled">0x171717ff</color>
+        <color button="normal">0x000000ff</color>
+        <color button="pressed">0xfafafaff</color>
+        <color button="disabled">0x0000004d</color>
       </font_color_record>
     </label_properties>
   </label_properties_table>
   <label_properties_table label_type="URL_POPUP">
-    <label_properties font_name="Tizen:style=Regular" font_size="25" label_alignment="center_middle" padding_X="0" padding_Y="0">
+    <label_properties font_name="Tizen:style=Regular" font_size="26" label_alignment="center_middle" padding_X="0" padding_Y="0">
       <font_color_record>
         <color button="normal">0x000000ff</color>
         <color button="pressed">0xfafafaff</color>
@@ -652,12 +697,17 @@
     <label_properties label_alignment="center_bottom" padding_X="0" padding_Y="10">
     </label_properties>
   </label_properties_table>
-  <label_properties_table label_type="IMAGE_3X4_TOP">
-    <label_properties label_alignment="center_top" padding_X="0" padding_Y="8">
+  <label_properties_table label_type="IMAGE_3X4_TOP" label_alignment="center_top" font_name="Tizen:style=Regular" font_size="24">
+    <label_properties label_alignment="center_top" padding_X="0" padding_Y="10">
+    <font_color_record>
+        <color button="normal">0xfafafaff</color>
+        <color button="pressed">0xfafafa7f</color>
+        <color button="disabled">0x17171766</color>
+      </font_color_record>
     </label_properties>
   </label_properties_table>
   <label_properties_table label_type="IMAGE_3X4">
-    <label_properties label_alignment="center_middle" padding_X="0" padding_Y="0">
+    <label_properties label_alignment="center_middle" font_size="24" padding_X="0" padding_Y="0">
     </label_properties>
   </label_properties_table>
   <label_properties_table label_type="IMAGE_3X4_SPACE">
diff --git a/data/layout/wearable/magnifier_configure.xml b/data/layout/wearable/magnifier_configure.xml
index bec7bec..dd6166f 100644 (file)
--- a/data/layout/wearable/magnifier_configure.xml
+++ b/data/layout/wearable/magnifier_configure.xml
@@ -17,6 +17,17 @@
   </background_image_path>
   <use_window>true</use_window>
   <label_type>MAGNIFIER</label_type>
+  <window_decorator size="0">
+    <image direction="top_left"/>
+    <image direction="top_center"/>
+    <image direction="top_right"/>
+    <image direction="middle_left"/>
+    <image direction="middle_center">nine patch/popup_stroke.#.png</image>
+    <image direction="middle_right"/>
+    <image direction="bottom_left"/>
+    <image direction="bottom_center"/>
+    <image direction="bottom_right"/>
+  </window_decorator>
   <padding>
     <x>-10</x>
     <y>10</y>
diff --git a/src/candidate/efl/candidate-efl.cpp b/src/candidate/efl/candidate-efl.cpp
index 9347501..8bcea2c 100644 (file)
--- a/src/candidate/efl/candidate-efl.cpp
+++ b/src/candidate/efl/candidate-efl.cpp
@@ -188,7 +188,6 @@ EflCandidate::get_height() {
 void
 EflCandidate::update(const vector<string> &vec_str) {
     cur_candidates = vec_str;
-
     /* first clear all the old candidate items */
     for (int i = 0; i < MAX_CANDIDATE; ++i) {
         if (candidates[i]) {
Domain: UI Framework / Text Input;