Added autopopup for 3x4 English layout

Change-Id: I4029cd03bda128b2f2f127bf740062136b6a25e5

diff --git a/data/layout/wearable/LYT_PORTRAIT_4X4_ENGLISH.xml b/data/layout/wearable/LYT_PORTRAIT_4X4_ENGLISH.xml
index 120e0a9..d9f972e 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">
-    <key key_type="string" button_type="multitap" long_key_value="1" longkey_magnifier="true">
+    <key key_type="string" button_type="multitap" popup_type="auto_popup">
       <label>
         <rec multi="0">.,?!</rec>
         <rec multi="1">1</rec>
@@ -18,8 +18,15 @@
         <rec multichar_state="2">?</rec>
         <rec multichar_state="3">!</rec>
       </key_value>
+      <auto_popup_keys>
+        <label autopopup="0">1</label>
+        <label autopopup="1">.</label>
+        <label autopopup="2">,</label>
+        <label autopopup="3">?</label>
+        <label autopopup="4">!</label>
+      </auto_popup_keys>
     </key>
-    <key key_type="string" button_type="multitap" long_key_value="2" longkey_magnifier="true">
+    <key key_type="string" button_type="multitap" popup_type="auto_popup">
       <label>
         <rec multi="0" auto_upper="true">abc</rec>
         <rec multi="1">2</rec>
@@ -29,8 +36,14 @@
         <rec auto_upper="true" multichar_state="1">b</rec>
         <rec auto_upper="true" multichar_state="2">c</rec>
       </key_value>
+      <auto_popup_keys>
+        <label autopopup="0">2</label>
+        <label autopopup="1">a</label>
+        <label autopopup="2">b</label>
+        <label autopopup="3">c</label>
+      </auto_popup_keys>
     </key>
-    <key key_type="string" button_type="multitap" long_key_value="3" longkey_magnifier="true">
+    <key key_type="string" button_type="multitap" popup_type="auto_popup">
       <label>
         <rec multi="0" auto_upper="true">def</rec>
         <rec multi="1">3</rec>
@@ -40,6 +53,12 @@
         <rec auto_upper="true" multichar_state="1">e</rec>
         <rec auto_upper="true" multichar_state="2">f</rec>
       </key_value>
+      <auto_popup_keys>
+        <label autopopup="0">d</label>
+        <label autopopup="1">e</label>
+        <label autopopup="2">f</label>
+        <label autopopup="3">3</label>
+      </auto_popup_keys>
     </key>
     <key key_type="control" use_repeat_key="true" image_label_type="IMAGE_3X4_TOP">
       <image_label>
@@ -52,7 +71,7 @@
     </key>
   </row>
   <row x="20">
-    <key key_type="string" button_type="multitap" long_key_value="4" longkey_magnifier="true">
+    <key key_type="string" button_type="multitap" popup_type="auto_popup">
       <label>
         <rec multi="0" auto_upper="true">ghi</rec>
         <rec multi="1">4</rec>
@@ -62,8 +81,14 @@
         <rec auto_upper="true" multichar_state="1">h</rec>
         <rec auto_upper="true" multichar_state="2">i</rec>
       </key_value>
+      <auto_popup_keys>
+        <label autopopup="0">4</label>
+        <label autopopup="1">g</label>
+        <label autopopup="2">h</label>
+        <label autopopup="3">i</label>
+      </auto_popup_keys>
     </key>
-    <key key_type="string" button_type="multitap" long_key_value="5" longkey_magnifier="true">
+    <key key_type="string" button_type="multitap" popup_type="auto_popup">
       <label>
         <rec multi="0" auto_upper="true">jkl</rec>
         <rec multi="1">5</rec>
@@ -73,8 +98,14 @@
         <rec auto_upper="true" multichar_state="1">k</rec>
         <rec auto_upper="true" multichar_state="2">l</rec>
       </key_value>
+      <auto_popup_keys>
+        <label autopopup="0">5</label>
+        <label autopopup="1">j</label>
+        <label autopopup="2">k</label>
+        <label autopopup="3">l</label>
+      </auto_popup_keys>
     </key>
-    <key key_type="string" button_type="multitap" long_key_value="6" longkey_magnifier="true">
+    <key key_type="string" button_type="multitap" popup_type="auto_popup">
       <label>
         <rec multi="0" auto_upper="true">mno</rec>
         <rec multi="1">6</rec>
@@ -84,6 +115,12 @@
         <rec auto_upper="true" multichar_state="1">n</rec>
         <rec auto_upper="true" multichar_state="2">o</rec>
       </key_value>
+      <auto_popup_keys>
+        <label autopopup="0">m</label>
+        <label autopopup="1">n</label>
+        <label autopopup="2">o</label>
+        <label autopopup="3">6</label>
+      </auto_popup_keys>
     </key>
     <key key_type="control" custom_id="Enter" image_label_type="IMAGE_3X4_TOP">
       <image_label>
@@ -97,7 +134,7 @@
     </key>
   </row>
   <row x="20">
-    <key key_type="string" button_type="multitap" long_key_value="7" longkey_magnifier="true">
+    <key key_type="string" button_type="multitap" popup_type="auto_popup">
       <label>
         <rec multi="0" auto_upper="true">pqrs</rec>
         <rec multi="1">7</rec>
@@ -108,8 +145,15 @@
         <rec auto_upper="true" multichar_state="2">r</rec>
         <rec auto_upper="true" multichar_state="3">s</rec>
       </key_value>
+      <auto_popup_keys>
+        <label autopopup="0">7</label>
+        <label autopopup="1">p</label>
+        <label autopopup="2">q</label>
+        <label autopopup="3">r</label>
+        <label autopopup="4">s</label>
+      </auto_popup_keys>
     </key>
-    <key key_type="string" button_type="multitap" long_key_value="8" longkey_magnifier="true">
+    <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>
@@ -119,8 +163,14 @@
         <rec auto_upper="true" multichar_state="1">u</rec>
         <rec auto_upper="true" multichar_state="2">v</rec>
       </key_value>
+      <auto_popup_keys>
+        <label autopopup="0">8</label>
+        <label autopopup="1">t</label>
+        <label autopopup="2">u</label>
+        <label autopopup="3">v</label>
+      </auto_popup_keys>
     </key>
-    <key key_type="string" button_type="multitap" long_key_value="9" longkey_magnifier="true">
+    <key key_type="string" button_type="multitap" popup_type="auto_popup">
       <label>
         <rec multi="0" auto_upper="true">wxyz</rec>
         <rec multi="1">9</rec>
@@ -131,6 +181,13 @@
         <rec auto_upper="true" multichar_state="2">y</rec>
         <rec auto_upper="true" multichar_state="3">z</rec>
       </key_value>
+      <auto_popup_keys>
+        <label autopopup="0">w</label>
+        <label autopopup="1">x</label>
+        <label autopopup="2">y</label>
+        <label autopopup="3">z</label>
+        <label autopopup="4">9</label>
+      </auto_popup_keys>
     </key>
     <key key_type="control" image_label_type="IMAGE_3X4_TOP">
       <image_label>

diff --git a/data/layout/wearable/autopopup_configure.xml b/data/layout/wearable/autopopup_configure.xml
index 19d8ee5..f3847dd 100644 (file)
--- a/data/layout/wearable/autopopup_configure.xml
+++ b/data/layout/wearable/autopopup_configure.xml
@@ -22,8 +22,8 @@
   </button_image_path>
   <sw_button_style>0</sw_button_style>
   <button_size>
-    <width>75</width>
-    <height>116</height>
+    <width>41</width>
+    <height>74</height>
   </button_size>
   <button_spacing>2</button_spacing>
   <label_type>AUTOPOPUP</label_type >

diff --git a/data/layout/wearable/label_property.xml b/data/layout/wearable/label_property.xml
index 7a9a617..7370b6a 100644 (file)
--- a/data/layout/wearable/label_property.xml
+++ b/data/layout/wearable/label_property.xml
@@ -522,7 +522,7 @@
     </label_properties>
   </label_properties_table>
   <label_properties_table label_type="AUTOPOPUP">
-    <label_properties font_name="Tizen:style=Regular" font_size="38" label_alignment="center_middle" padding_X="0" padding_Y="0">
+    <label_properties font_name="Tizen:style=Regular" font_size="37" label_alignment="center_middle" padding_X="0" padding_Y="0">
       <font_color_record>
         <color button="normal">0x171717ff</color>
         <color button="pressed">0x171717ff</color>