Fix change Done key display according to return type

Signed-off-by: liuxd <xd123.liu@samsung.com>
Change-Id: I2bc1c06ebb6affe65becb16e1e360e7e0406f6fb
(cherry picked from commit 5f893852b04c6b1b8cb7eb78e2e5f279473be1c6)

diff --git a/data/layout/tv/label_property.xml b/data/layout/tv/label_property.xml
index 12d3115..0e09923 100644 (file)
--- a/data/layout/tv/label_property.xml
+++ b/data/layout/tv/label_property.xml
@@ -545,7 +545,7 @@
     </label_properties>
   </label_properties_table>
   <label_properties_table label_type="IMAGE_DEFAULT">
-   <label_properties  label_alignment="center_middle" padding_X="0" padding_Y="0" width="60" height="60">
+   <label_properties font_name="Tizen:style=medium" font_size="28" label_alignment="center_middle" padding_X="0" padding_Y="0" width="60" height="60">
     </label_properties>
   </label_properties_table>
   <label_properties_table label_type="FONT_TEXT">

diff --git a/src/ise.cpp b/src/ise.cpp
index c696ccf..e235dfb 100644 (file)
--- a/src/ise.cpp
+++ b/src/ise.cpp
@@ -2125,6 +2125,9 @@ void ise_set_return_key_type(unsigned int type)
 
     if (type == ECORE_IMF_INPUT_PANEL_RETURN_KEY_TYPE_DEFAULT) {
         g_ui->unset_private_key("Enter");
+#ifdef _TV
+        g_ui->unset_private_key("Done");
+#endif
     } else {
 #ifdef _WEARABLE
         if (type == ECORE_IMF_INPUT_PANEL_RETURN_KEY_TYPE_SEARCH) {
@@ -2137,11 +2140,15 @@ void ise_set_return_key_type(unsigned int type)
         }
 #endif
 
+#ifdef _TV
+        g_ui->set_private_key("Done", buf, NULL, NULL, 0, const_cast<sclchar*>("Done"), TRUE);
+#else
         static sclchar *imagelabel[SCL_BUTTON_STATE_MAX] = {
             const_cast<sclchar*>(" "), const_cast<sclchar*>(" "), const_cast<sclchar*>(" ")
         };
 
         g_ui->set_private_key("Enter", buf, imagelabel, NULL, 0, const_cast<sclchar*>("Enter"), TRUE);
+#endif
         LOGD("return key lable : %s\n", buf);
     }
 }