Fix disable Done Key for TNEXT-517

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

diff --git a/data/layout/tv/LYT_LANDSCAPE_QTY_ENGLISH.xml b/data/layout/tv/LYT_LANDSCAPE_QTY_ENGLISH.xml
index 4e66176..1a68b6a 100644 (file)
--- a/data/layout/tv/LYT_LANDSCAPE_QTY_ENGLISH.xml
+++ b/data/layout/tv/LYT_LANDSCAPE_QTY_ENGLISH.xml
@@ -174,7 +174,7 @@
         <rec auto_upper="true">*</rec>
       </label>
     </key>
-    <key key_type="control" custom_id="Enter" label_type="IMAGE_DEFAULT" width="240">
+    <key key_type="uiitem" custom_id="Enter" label_type="IMAGE_DEFAULT" width="240">
        <image_label>
         <rec button="normal">ic_keypad_enter_bl.png</rec>
         <rec button="pressed">ic_keypad_enter_wh.png</rec>

diff --git a/data/layout/tv/LYT_LANDSCAPE_QTY_KOREAN.xml b/data/layout/tv/LYT_LANDSCAPE_QTY_KOREAN.xml
index 41d4a26..88d076a 100644 (file)
--- a/data/layout/tv/LYT_LANDSCAPE_QTY_KOREAN.xml
+++ b/data/layout/tv/LYT_LANDSCAPE_QTY_KOREAN.xml
@@ -218,7 +218,7 @@
         <rec auto_upper="true">*</rec>
       </label>
     </key>
-    <key key_type="control" custom_id="Enter" label_type="IMAGE_DEFAULT" width="240">
+    <key key_type="uiitem" custom_id="Enter" label_type="IMAGE_DEFAULT" width="240">
        <image_label>
         <rec button="normal">ic_keypad_enter_bl.png</rec>
         <rec button="pressed">ic_keypad_enter_wh.png</rec>

diff --git a/data/layout/tv/LYT_LANDSCAPE_QTY_SYM_1.xml b/data/layout/tv/LYT_LANDSCAPE_QTY_SYM_1.xml
index d0d36b2..8d3e257 100644 (file)
--- a/data/layout/tv/LYT_LANDSCAPE_QTY_SYM_1.xml
+++ b/data/layout/tv/LYT_LANDSCAPE_QTY_SYM_1.xml
@@ -173,7 +173,7 @@
         <rec>]</rec>
       </label>
     </key>
-    <key key_type="control" custom_id="Enter" label_type="IMAGE_DEFAULT" width="240">
+    <key key_type="uiitem" custom_id="Enter" label_type="IMAGE_DEFAULT" width="240">
        <image_label>
         <rec button="normal">ic_keypad_enter_bl.png</rec>
         <rec button="pressed">ic_keypad_enter_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 a7b60f8..0300b9f 100644 (file)
--- a/data/layout/tv/LYT_LANDSCAPE_QTY_SYM_2.xml
+++ b/data/layout/tv/LYT_LANDSCAPE_QTY_SYM_2.xml
@@ -173,7 +173,7 @@
         <rec>¤</rec>
       </label>
     </key>
-    <key key_type="control" custom_id="Enter" label_type="IMAGE_DEFAULT" width="240">
+    <key key_type="uiitem" custom_id="Enter" label_type="IMAGE_DEFAULT" width="240">
        <image_label>
         <rec button="normal">ic_keypad_enter_bl.png</rec>
         <rec button="pressed">ic_keypad_enter_wh.png</rec>

diff --git a/src/ise.cpp b/src/ise.cpp
index e2ad5b0..dcc978d 100644 (file)
--- a/src/ise.cpp
+++ b/src/ise.cpp
@@ -1878,8 +1878,13 @@ void ise_set_return_key_type(unsigned int type)
 void ise_set_return_key_disable(unsigned int disabled)
 {
     LOGD("enable : %d\n", !disabled);
+#ifdef _TV
+    if (g_ui)
+        g_ui->enable_button("Done", !disabled);
+#else
     if (g_ui)
         g_ui->enable_button("Enter", !disabled);
+#endif
 }
 
 void ise_get_language_locale(char **locale)