Fix issue: Disappearance of the page "(2/3)" in Emoticon layout 99/168899/2
authorzhangzg <zg84.zhang@samsung.com>
Thu, 1 Feb 2018 03:30:34 +0000 (11:30 +0800)
committerzhang zhigang <zg84.zhang@samsung.com>
Thu, 1 Feb 2018 04:53:27 +0000 (04:53 +0000)
Change-Id: Ief3ed81be67340ea99baadc710716fe1e575a60c

src/ise-emoticon-mode.cpp
src/ise.cpp

index 8b2ef04..fb523b6 100644 (file)
@@ -653,12 +653,8 @@ void ise_set_private_key_for_emoticon_mode(const emoticon_group_t emoticon_group
 
         group_name = ise_get_emoticon_group_name(emoticon_group);
         if (group_name) {
-#ifdef _WEARABLE
-            sclchar* imagebg[SCL_BUTTON_STATE_MAX] = {
-               const_cast<sclchar*>("button/B09_Qwerty_btn_press.png"), const_cast<sclchar*>(""), const_cast<sclchar*>("")};
 
-            g_ui->set_private_key(group_name, const_cast<sclchar*>(""), NULL, imagebg, 0, const_cast<sclchar*>(group_name), TRUE);
-#else
+#ifndef _WEARABLE
             sclchar* imagelabel[SCL_BUTTON_STATE_MAX] = {
                const_cast<sclchar*>(emoticon_group_icons_press[emoticon_group]), const_cast<sclchar*>(""), const_cast<sclchar*>("")};
 
index cb97b9d..a842602 100644 (file)
@@ -1143,9 +1143,7 @@ SCLEventReturnType CUIEventCallback::on_event_key_clicked(SclUIEventDesc event_d
                     const int BUF_LEN = 16;
                     char buf[BUF_LEN] = {0};
                     snprintf(buf, BUF_LEN, "%d/3", group_id);
-                    static sclchar *imagelabel[SCL_BUTTON_STATE_MAX] = {
-                           const_cast<sclchar*>(" "), const_cast<sclchar*>(" "), const_cast<sclchar*>(" ")};
-                    g_ui->set_private_key("EMOTICON_GROUP_ID", buf, imagelabel, NULL, 0, const_cast<sclchar*>("EMOTICON_GROUP_NEXT"), TRUE);
+                    g_ui->set_private_key("EMOTICON_GROUP_ID", buf, NULL, NULL, 0, const_cast<sclchar*>("EMOTICON_GROUP_NEXT"), TRUE);
 #else
                     emoticon_group_t group_id = ise_get_emoticon_group_id(event_desc.key_value);
 #endif