Fix hide ime after press "Cancel" and "Done" Key

Signed-off-by: liuxd <xd123.liu@samsung.com>
Change-Id: I30d91bceb56c1771df4741a6c63184030f3ceb07

diff --git a/data/layout/tv/LYT_LANDSCAPE_QTY_ENGLISH.xml b/data/layout/tv/LYT_LANDSCAPE_QTY_ENGLISH.xml
index 6e22167..4e66176 100644 (file)
--- a/data/layout/tv/LYT_LANDSCAPE_QTY_ENGLISH.xml
+++ b/data/layout/tv/LYT_LANDSCAPE_QTY_ENGLISH.xml
@@ -265,7 +265,7 @@
         <rec auto_upper="true">!</rec>
       </label>
     </key>
-    <key key_type="control"  custom_id="Done" label_type="FONT_OPTION" width="240" height="176">
+    <key key_type="user"  custom_id="Done" label_type="FONT_OPTION" width="240" height="176">
       <label>
         <rec>Done</rec>
       </label>
@@ -274,7 +274,7 @@
         <rec button="pressed">btn_keypad_pressed.9.png</rec>
       </background_image>
       <key_value>
-       <rec>Enter</rec>
+       <rec>Done</rec>
       </key_value>
     </key>
   </row>

diff --git a/data/layout/tv/LYT_LANDSCAPE_QTY_KOREAN.xml b/data/layout/tv/LYT_LANDSCAPE_QTY_KOREAN.xml
index 5c227d9..41d4a26 100644 (file)
--- a/data/layout/tv/LYT_LANDSCAPE_QTY_KOREAN.xml
+++ b/data/layout/tv/LYT_LANDSCAPE_QTY_KOREAN.xml
@@ -336,7 +336,7 @@
         <rec auto_upper="true">!</rec>
       </label>
     </key>
-    <key key_type="control"  custom_id="Done" label_type="FONT_OPTION" width="240" height="176">
+    <key key_type="user"  custom_id="Done" label_type="FONT_OPTION" width="240" height="176">
       <label>
         <rec>Done</rec>
       </label>
@@ -345,7 +345,7 @@
         <rec button="pressed">btn_keypad_pressed.9.png</rec>
       </background_image>
       <key_value>
-       <rec>Enter</rec>
+       <rec>Done</rec>
       </key_value>
     </key>
   </row>

diff --git a/data/layout/tv/LYT_LANDSCAPE_QTY_NUMONLY.xml b/data/layout/tv/LYT_LANDSCAPE_QTY_NUMONLY.xml
index 185963a..4fcd64d 100644 (file)
--- a/data/layout/tv/LYT_LANDSCAPE_QTY_NUMONLY.xml
+++ b/data/layout/tv/LYT_LANDSCAPE_QTY_NUMONLY.xml
@@ -72,7 +72,7 @@
         <rec>BackSpace</rec>
       </key_value>
     </key>
-    <key key_type="modechange" custom_id="Done" label_type="FONT_OPTION" width="240">
+    <key key_type="user" custom_id="Done" label_type="FONT_OPTION" width="240">
       <label>
         <rec>Done</rec>
       </label>
@@ -81,7 +81,7 @@
         <rec button="pressed">btn_keypad_pressed.9.png</rec>
       </background_image>
       <key_value>
-       <rec>Enter</rec>
+       <rec>Done</rec>
       </key_value>
     </key>
   </row>

diff --git a/data/layout/tv/LYT_LANDSCAPE_QTY_SYM_1.xml b/data/layout/tv/LYT_LANDSCAPE_QTY_SYM_1.xml
index 0b1f3d9..d0d36b2 100644 (file)
--- a/data/layout/tv/LYT_LANDSCAPE_QTY_SYM_1.xml
+++ b/data/layout/tv/LYT_LANDSCAPE_QTY_SYM_1.xml
@@ -264,7 +264,7 @@
         <rec>≫</rec>
       </label>
     </key>
-    <key key_type="control"  custom_id="Done" label_type="FONT_OPTION" width="240" height="176">
+    <key key_type="user"  custom_id="Done" label_type="FONT_OPTION" width="240" height="176">
       <label>
         <rec>Done</rec>
       </label>
@@ -273,7 +273,7 @@
         <rec button="pressed">btn_keypad_pressed.9.png</rec>
       </background_image>
       <key_value>
-       <rec>Enter</rec>
+       <rec>Done</rec>
       </key_value>
     </key>
   </row>
@@ -348,7 +348,7 @@
     </key>
   </row>
   <row x="240">
-    <key button_type="uiitem" key_type="user" custom_id="Option" label_type="IMAGE_DEFAULT">
+    <key key_type="user" custom_id="Option" label_type="IMAGE_DEFAULT">
       <image_label>
         <rec button="normal">ic_keypad_setting_bl.png</rec>
         <rec button="pressed">ic_keypad_setting_wh.png</rec>

diff --git a/data/layout/tv/LYT_LANDSCAPE_QTY_SYM_2.xml b/data/layout/tv/LYT_LANDSCAPE_QTY_SYM_2.xml
index 9dabcd4..a7b60f8 100644 (file)
--- a/data/layout/tv/LYT_LANDSCAPE_QTY_SYM_2.xml
+++ b/data/layout/tv/LYT_LANDSCAPE_QTY_SYM_2.xml
@@ -264,7 +264,7 @@
         <rec>♥</rec>
       </label>
     </key>
-    <key key_type="control"  custom_id="Done" label_type="FONT_OPTION" width="240" height="176">
+    <key key_type="user"  custom_id="Done" label_type="FONT_OPTION" width="240" height="176">
       <label>
         <rec>Done</rec>
       </label>
@@ -273,7 +273,7 @@
         <rec button="pressed">btn_keypad_pressed.9.png</rec>
       </background_image>
       <key_value>
-       <rec>Enter</rec>
+       <rec>Done</rec>
       </key_value>
     </key>
   </row>
@@ -334,7 +334,7 @@
     </key>
   </row>
   <row x="240">
-    <key button_type="uiitem" key_type="user" custom_id="Option" label_type="IMAGE_DEFAULT">
+    <key key_type="user" custom_id="Option" label_type="IMAGE_DEFAULT">
       <image_label>
         <rec button="normal">ic_keypad_setting_bl.png</rec>
         <rec button="pressed">ic_keypad_setting_wh.png</rec>

diff --git a/src/ise.cpp b/src/ise.cpp
index f20214f..ea1abc7 100644 (file)
--- a/src/ise.cpp
+++ b/src/ise.cpp
@@ -1029,6 +1029,12 @@ SCLEventReturnType CUIEventCallback::on_event_key_clicked(SclUIEventDesc event_d
                     if (g_keyboard_state.visible_state)
                         ise_show(g_keyboard_state.ic);
                 }
+                ise_send_event(IME_KEY_Cancel, KEY_MASK_NULL);
+                ime_request_hide();
+            }  else if (strcmp(event_desc.key_value, "Done") == 0) {
+                ret = SCL_EVENT_DONE;
+                ise_send_event(IME_KEY_Return, KEY_MASK_NULL);
+                ime_request_hide();
             }  else {
                 const sclchar *input_mode = g_ui->get_input_mode();
                 if ((NULL != input_mode) && (!strcmp(input_mode, "EMOTICON_LAYOUT"))) {