From a56da0df2c993763cfa984b86891b7052adbb90a Mon Sep 17 00:00:00 2001 From: Shinwoo Kim Date: Thu, 25 Oct 2018 11:15:21 +0900 Subject: [PATCH 01/16] Remove unnecessary line setting window size Maximized window does not need to set its size on application side. Because of the unnecessary line setting window size, application could get a black screen for around 2 seconds by window mananger policy. Please refer to following steps. (1) Wearable image > contacts > select one item > message button (2) After step (1), edit message, then added message is not visible because its window size becomes 1000 * 1000 on 360 * 360 wearable screen. Change-Id: I48769b89df3d8598f350564d7124fff16e862821 --- src/w-input-selector.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/w-input-selector.cpp b/src/w-input-selector.cpp index f9c1243..1658c9d 100755 --- a/src/w-input-selector.cpp +++ b/src/w-input-selector.cpp @@ -1260,7 +1260,6 @@ bool __compare_string(const char * smart_str, const char * template_str) bool _app_create(void* user_data) { - int width = 1000, height = 1000; // App_Data* app_data = NULL; Evas_Object* layout = NULL; Evas_Object* conform = NULL; @@ -1284,8 +1283,6 @@ bool _app_create(void* user_data) elm_win_title_set(window, PACKAGE); elm_win_borderless_set(window, EINA_TRUE); -// ecore_x_window_size_get(ecore_x_window_root_first_get(), &width, &height); - evas_object_resize(window, width, height); elm_win_indicator_mode_set(window, ELM_WIN_INDICATOR_SHOW); } else { LOGE("elm_win_add() is failed."); -- 2.7.4 From ae9be91f1eefb8517016a9b9c91730b587970833 Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Fri, 26 Oct 2018 11:59:56 +0900 Subject: [PATCH 02/16] Fix indentation Change-Id: I9607aa635a06771018172771096fcdbb197a1231 Signed-off-by: Jihoon Kim --- src/w-input-stt-engine.cpp | 2 -- src/w-input-stt-ise.cpp | 66 ++++++++++++++++++++++------------------------ src/w-input-stt-voice.cpp | 1 - 3 files changed, 32 insertions(+), 37 deletions(-) diff --git a/src/w-input-stt-engine.cpp b/src/w-input-stt-engine.cpp index 1a69ad7..92eb26a 100755 --- a/src/w-input-stt-engine.cpp +++ b/src/w-input-stt-engine.cpp @@ -73,5 +73,3 @@ bool _app_stt_initialize(VoiceData *voice_data) return true; } - - diff --git a/src/w-input-stt-ise.cpp b/src/w-input-stt-ise.cpp index 0d14c94..ace6400 100755 --- a/src/w-input-stt-ise.cpp +++ b/src/w-input-stt-ise.cpp @@ -36,7 +36,7 @@ VoiceData *my_voicedata = NULL; void show_voice_input(Evas_Object *parent, const char *lang, void (*get_string)(char *, int)) { - PRINTFUNC(DLOG_ERROR, "show voice"); + PRINTFUNC(DLOG_DEBUG, "show voice"); int init = 0; destroy_voice(); @@ -86,51 +86,49 @@ void resume_voice(){ void destroy_voice() { - PRINTFUNC(DLOG_DEBUG, "destroy voice"); + PRINTFUNC(DLOG_DEBUG, "destroy voice"); - //stt_feedback_deinitialize(); // It disable w-input-selector touch sound. So removed. + //stt_feedback_deinitialize(); // It disable w-input-selector touch sound. So removed. - vconf_ignore_key_changed(VCONFKEY_ISE_STT_LANGUAGE, _stt_lang_changed_cb); + vconf_ignore_key_changed(VCONFKEY_ISE_STT_LANGUAGE, _stt_lang_changed_cb); - if (my_voicedata) { - on_destroy(my_voicedata); - my_voicedata = NULL; - } + if (my_voicedata) { + on_destroy(my_voicedata); + my_voicedata = NULL; + } destroy_voice_recorder(); - } +} - int is_lang_supported_by_voice_input(const char *lang) - { - PRINTFUNC(DLOG_DEBUG, "Is lang %s supported by voice input", lang); - char kbd_lang[6]; +int is_lang_supported_by_voice_input(const char *lang) +{ + PRINTFUNC(DLOG_DEBUG, "Is lang %s supported by voice input", lang); + char kbd_lang[6]; - if (NULL == lang) - return FALSE; + if (NULL == lang) + return FALSE; - strncpy(kbd_lang, lang, sizeof(kbd_lang)); - kbd_lang[5] = '\0'; + strncpy(kbd_lang, lang, sizeof(kbd_lang)); + kbd_lang[5] = '\0'; - return (is_lang_supported_by_stt(kbd_lang)); - } + return (is_lang_supported_by_stt(kbd_lang)); +} void ise_show_stt_popup(void *data) - { - App_Data* ad = (App_Data*)data; - - if (!ad) - return; - - show_voice_input((Evas_Object*)ad->naviframe, NULL, NULL); - } +{ + App_Data* ad = (App_Data*)data; - void set_disclaimer_flag() - { - PRINTFUNC(DLOG_DEBUG, "set_disclaimer_flag"); + if (!ad) + return; - if (my_voicedata) { - my_voicedata->disclaimer = 1; - } - } + show_voice_input((Evas_Object*)ad->naviframe, NULL, NULL); +} +void set_disclaimer_flag() +{ + PRINTFUNC(DLOG_DEBUG, "set_disclaimer_flag"); + if (my_voicedata) { + my_voicedata->disclaimer = 1; + } +} diff --git a/src/w-input-stt-voice.cpp b/src/w-input-stt-voice.cpp index 815ef56..658573f 100755 --- a/src/w-input-stt-voice.cpp +++ b/src/w-input-stt-voice.cpp @@ -530,7 +530,6 @@ static Eina_Bool _idler_cb(void *data) PRINTFUNC(DLOG_DEBUG, ""); - if (true == _app_stt_initialize(voicedata)) { LOGD("_app_stt_initialize None Error"); voicedata->voicefw_state = 1; -- 2.7.4 From 27ec446b4eb0a13440eb5723d1454fb7d9d10882 Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Fri, 26 Oct 2018 12:01:40 +0900 Subject: [PATCH 03/16] Fix issue black screen in stt mode Change-Id: Ib7da0f9e088d02d19c7c02b154598c4e9895de72 Signed-off-by: Jihoon Kim --- src/w-input-stt-voice.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/w-input-stt-voice.cpp b/src/w-input-stt-voice.cpp index 658573f..b238446 100755 --- a/src/w-input-stt-voice.cpp +++ b/src/w-input-stt-voice.cpp @@ -1962,6 +1962,7 @@ int init_voicedata(VoiceData *r_voicedata) voicedata->main_entry = NULL; voicedata->state = STT_STATE_VAL_INIT; voicedata->kbd_lang = NULL; + voicedata->setup_timer = NULL; voicedata->start_timer = NULL; voicedata->refresh_timer = NULL; voicedata->textblock_timer = NULL; -- 2.7.4 From cff7b79358a81cbc0202b675cd68dca43d38ce60 Mon Sep 17 00:00:00 2001 From: zhangzg Date: Sat, 27 Oct 2018 13:27:17 +0800 Subject: [PATCH 04/16] "Add line feed" Change-Id: I4668a65318e2c74b963a50f9ef875c839df3d73a --- src/w-input-stt-ise.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/w-input-stt-ise.cpp b/src/w-input-stt-ise.cpp index ace6400..3d7fc2d 100755 --- a/src/w-input-stt-ise.cpp +++ b/src/w-input-stt-ise.cpp @@ -68,7 +68,8 @@ void show_voice_input(Evas_Object *parent, const char *lang, void (*get_string)( vconf_notify_key_changed(VCONFKEY_ISE_STT_LANGUAGE, _stt_lang_changed_cb, my_voicedata); } -void pause_voice(){ +void pause_voice() +{ PRINTFUNC(DLOG_DEBUG, "pause_voice"); powerUnlock(); @@ -77,7 +78,8 @@ void pause_voice(){ } } -void resume_voice(){ +void resume_voice() +{ if (my_voicedata) { PRINTFUNC(DLOG_DEBUG, "resume_voice"); on_stt_resume(my_voicedata); -- 2.7.4 From 402d2c3b8185bdc1340172c63b7e71fd1e149607 Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Fri, 26 Oct 2018 12:02:24 +0900 Subject: [PATCH 05/16] Update package version to 0.1.181026 Change-Id: Icf63de6506dca4fcee1ff4a8d0fb8eb61b9d7d1b Signed-off-by: Jihoon Kim --- org.tizen.inputdelegator.xml | 2 +- packaging/org.tizen.inputdelegator.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/org.tizen.inputdelegator.xml b/org.tizen.inputdelegator.xml index 744c5a4..0ef0a96 100755 --- a/org.tizen.inputdelegator.xml +++ b/org.tizen.inputdelegator.xml @@ -1,5 +1,5 @@ - + diff --git a/packaging/org.tizen.inputdelegator.spec b/packaging/org.tizen.inputdelegator.spec index c52846e..d80ecd4 100755 --- a/packaging/org.tizen.inputdelegator.spec +++ b/packaging/org.tizen.inputdelegator.spec @@ -9,7 +9,7 @@ Name: org.tizen.inputdelegator Summary: Input Delegator Application -Version: 0.1.180521 +Version: 0.1.181026 Release: 1 Group: Applications License: Apache-2.0 -- 2.7.4 From ee7b7d53aff1b32c6fae3ad9057c8020fac480ba Mon Sep 17 00:00:00 2001 From: "sungwook79.park" Date: Fri, 7 Dec 2018 16:20:06 +0900 Subject: [PATCH 06/16] Fix mismatch between log format and actual parameter Change-Id: I9d3fb5395446393afeec900b8f3b02a9f959d791 Signed-off-by: sungwook79.park --- src/voice-recorder.cpp | 2 +- src/w-input-stt-voice.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/voice-recorder.cpp b/src/voice-recorder.cpp index b30e5e3..98b8a05 100644 --- a/src/voice-recorder.cpp +++ b/src/voice-recorder.cpp @@ -174,7 +174,7 @@ static void _recorder_stop(voice_recorder *recorder) if (recorder->recorder) { commitResult = recorder_commit(recorder->recorder); if (commitResult != RECORDER_ERROR_NONE) { - LOGD("recorder_commit failed Error [%d]", recorder_commit); + LOGD("recorder_commit failed Error"); } _main_file_register(recorder->file_path); } diff --git a/src/w-input-stt-voice.cpp b/src/w-input-stt-voice.cpp index b238446..4735348 100755 --- a/src/w-input-stt-voice.cpp +++ b/src/w-input-stt-voice.cpp @@ -870,7 +870,7 @@ void on_initial_anim_press_cb(void *data, Evas_Object *obj, const char *emission int tempVal = vd->sttmanager->GetCurrent(); if(tempVal == STT_STATE_CREATED) { - PRINTFUNC(DLOG_WARN, "IGNORE TOUCH event before STT READY. STT is preparing", vd->state); + PRINTFUNC(DLOG_WARN, "IGNORE TOUCH event before STT READY. STT is preparing"); return; } -- 2.7.4 From ec2946785710c65f693262f572b6e85d682a0ef4 Mon Sep 17 00:00:00 2001 From: "sungwook79.park" Date: Fri, 7 Dec 2018 16:21:45 +0900 Subject: [PATCH 07/16] Update package version to 0.1.181207 Change-Id: I9ca498edd6d3b25a52fbe197313c7a28ad330f92 Signed-off-by: sungwook79.park --- org.tizen.inputdelegator.xml | 2 +- packaging/org.tizen.inputdelegator.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/org.tizen.inputdelegator.xml b/org.tizen.inputdelegator.xml index 0ef0a96..9afe0bd 100755 --- a/org.tizen.inputdelegator.xml +++ b/org.tizen.inputdelegator.xml @@ -1,5 +1,5 @@ - + diff --git a/packaging/org.tizen.inputdelegator.spec b/packaging/org.tizen.inputdelegator.spec index d80ecd4..1ed0f2d 100755 --- a/packaging/org.tizen.inputdelegator.spec +++ b/packaging/org.tizen.inputdelegator.spec @@ -9,7 +9,7 @@ Name: org.tizen.inputdelegator Summary: Input Delegator Application -Version: 0.1.181026 +Version: 0.1.181207 Release: 1 Group: Applications License: Apache-2.0 -- 2.7.4 From f573f031986c1d320a04c0a302f4534c840879cb Mon Sep 17 00:00:00 2001 From: Ji-hoon Lee Date: Mon, 10 Dec 2018 09:27:04 +0900 Subject: [PATCH 08/16] Fix mismatch between log format and actual parameter Change-Id: Ib0356649598e411ad6fad7cd2ef1bca515e2c1a3 --- src/SttFeedback.cpp | 4 ++-- src/w-input-emoticon.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) mode change 100755 => 100644 src/SttFeedback.cpp mode change 100755 => 100644 src/w-input-emoticon.cpp diff --git a/src/SttFeedback.cpp b/src/SttFeedback.cpp old mode 100755 new mode 100644 index f6ae7da..5bd6603 --- a/src/SttFeedback.cpp +++ b/src/SttFeedback.cpp @@ -50,11 +50,11 @@ void SttFeedback::OnResult( // Normal result case : STT_RECOGNITION_TYPE_FREE if(results.size() < 1) { - PRINTFUNC(DLOG_ERROR, "Result size : %d", results.size()); + PRINTFUNC(DLOG_ERROR, "Result size : %zu", results.size()); vd.state = STT_STATE_VAL_NOT_RECOGNISED; set_animation_state(&vd); } else { - PRINTFUNC(DLOG_INFO, "Meaningful result : size (%d)", results.size()); + PRINTFUNC(DLOG_INFO, "Meaningful result : size (%zu)", results.size()); for(auto result : results) { PRINTFUNC(DLOG_INFO, "Results"); diff --git a/src/w-input-emoticon.cpp b/src/w-input-emoticon.cpp old mode 100755 new mode 100644 index 6c5c902..146e4b2 --- a/src/w-input-emoticon.cpp +++ b/src/w-input-emoticon.cpp @@ -934,7 +934,7 @@ void _update_emoticon_items(void *data) if (first_it == NULL) first_it = it_emoticon_recent_group; - PRINTFUNC(DLOG_DEBUG, "size = %d", recent_emoji_list.size()); + PRINTFUNC(DLOG_DEBUG, "size = %zu", recent_emoji_list.size()); for (i=0;i < recent_emoji_list.size();i=i+3) { -- 2.7.4 From 66114cb0461a8ccd6a9b129c1135338c6264610a Mon Sep 17 00:00:00 2001 From: Ji-hoon Lee Date: Mon, 10 Dec 2018 09:27:55 +0900 Subject: [PATCH 09/16] Change source file permissions to 0644 Change-Id: I826c5f3afa8d438b161599fcf5247a10e813b1cb --- inc/Debug.h | 0 inc/MicEffector.h | 0 inc/MoreOption.h | 0 inc/SttFeedback.h | 0 inc/SttManager.h | 0 inc/WInputSttMicEffect.h | 0 inc/w-input-emoticon.h | 0 inc/w-input-keyboard.h | 0 inc/w-input-selector.h | 0 inc/w-input-stt-engine.h | 0 inc/w-input-stt-ise.h | 0 inc/w-input-stt-voice.h | 0 inc/w-input-template.h | 0 org.tizen.inputdelegator.xml | 0 src/MoreOption.cpp | 0 src/SttManager.cpp | 0 src/w-input-keyboard.cpp | 0 src/w-input-selector.cpp | 0 src/w-input-stt-engine.cpp | 0 src/w-input-stt-ise.cpp | 0 src/w-input-stt-voice.cpp | 0 src/w-input-template.cpp | 0 22 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 inc/Debug.h mode change 100755 => 100644 inc/MicEffector.h mode change 100755 => 100644 inc/MoreOption.h mode change 100755 => 100644 inc/SttFeedback.h mode change 100755 => 100644 inc/SttManager.h mode change 100755 => 100644 inc/WInputSttMicEffect.h mode change 100755 => 100644 inc/w-input-emoticon.h mode change 100755 => 100644 inc/w-input-keyboard.h mode change 100755 => 100644 inc/w-input-selector.h mode change 100755 => 100644 inc/w-input-stt-engine.h mode change 100755 => 100644 inc/w-input-stt-ise.h mode change 100755 => 100644 inc/w-input-stt-voice.h mode change 100755 => 100644 inc/w-input-template.h mode change 100755 => 100644 org.tizen.inputdelegator.xml mode change 100755 => 100644 src/MoreOption.cpp mode change 100755 => 100644 src/SttManager.cpp mode change 100755 => 100644 src/w-input-keyboard.cpp mode change 100755 => 100644 src/w-input-selector.cpp mode change 100755 => 100644 src/w-input-stt-engine.cpp mode change 100755 => 100644 src/w-input-stt-ise.cpp mode change 100755 => 100644 src/w-input-stt-voice.cpp mode change 100755 => 100644 src/w-input-template.cpp diff --git a/inc/Debug.h b/inc/Debug.h old mode 100755 new mode 100644 diff --git a/inc/MicEffector.h b/inc/MicEffector.h old mode 100755 new mode 100644 diff --git a/inc/MoreOption.h b/inc/MoreOption.h old mode 100755 new mode 100644 diff --git a/inc/SttFeedback.h b/inc/SttFeedback.h old mode 100755 new mode 100644 diff --git a/inc/SttManager.h b/inc/SttManager.h old mode 100755 new mode 100644 diff --git a/inc/WInputSttMicEffect.h b/inc/WInputSttMicEffect.h old mode 100755 new mode 100644 diff --git a/inc/w-input-emoticon.h b/inc/w-input-emoticon.h old mode 100755 new mode 100644 diff --git a/inc/w-input-keyboard.h b/inc/w-input-keyboard.h old mode 100755 new mode 100644 diff --git a/inc/w-input-selector.h b/inc/w-input-selector.h old mode 100755 new mode 100644 diff --git a/inc/w-input-stt-engine.h b/inc/w-input-stt-engine.h old mode 100755 new mode 100644 diff --git a/inc/w-input-stt-ise.h b/inc/w-input-stt-ise.h old mode 100755 new mode 100644 diff --git a/inc/w-input-stt-voice.h b/inc/w-input-stt-voice.h old mode 100755 new mode 100644 diff --git a/inc/w-input-template.h b/inc/w-input-template.h old mode 100755 new mode 100644 diff --git a/org.tizen.inputdelegator.xml b/org.tizen.inputdelegator.xml old mode 100755 new mode 100644 diff --git a/src/MoreOption.cpp b/src/MoreOption.cpp old mode 100755 new mode 100644 diff --git a/src/SttManager.cpp b/src/SttManager.cpp old mode 100755 new mode 100644 diff --git a/src/w-input-keyboard.cpp b/src/w-input-keyboard.cpp old mode 100755 new mode 100644 diff --git a/src/w-input-selector.cpp b/src/w-input-selector.cpp old mode 100755 new mode 100644 diff --git a/src/w-input-stt-engine.cpp b/src/w-input-stt-engine.cpp old mode 100755 new mode 100644 diff --git a/src/w-input-stt-ise.cpp b/src/w-input-stt-ise.cpp old mode 100755 new mode 100644 diff --git a/src/w-input-stt-voice.cpp b/src/w-input-stt-voice.cpp old mode 100755 new mode 100644 diff --git a/src/w-input-template.cpp b/src/w-input-template.cpp old mode 100755 new mode 100644 -- 2.7.4 From 687799551e2d6275852f552a34b4a322f27af986 Mon Sep 17 00:00:00 2001 From: Ji-hoon Lee Date: Mon, 10 Dec 2018 09:28:15 +0900 Subject: [PATCH 10/16] Update package version to 0.1.181210 Change-Id: Ica12cf9221f51dcf4d2ab97d72bc472b1c30bba0 --- org.tizen.inputdelegator.xml | 2 +- packaging/org.tizen.inputdelegator.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/org.tizen.inputdelegator.xml b/org.tizen.inputdelegator.xml index 9afe0bd..4967493 100644 --- a/org.tizen.inputdelegator.xml +++ b/org.tizen.inputdelegator.xml @@ -1,5 +1,5 @@ - + diff --git a/packaging/org.tizen.inputdelegator.spec b/packaging/org.tizen.inputdelegator.spec index 1ed0f2d..b560348 100755 --- a/packaging/org.tizen.inputdelegator.spec +++ b/packaging/org.tizen.inputdelegator.spec @@ -9,7 +9,7 @@ Name: org.tizen.inputdelegator Summary: Input Delegator Application -Version: 0.1.181207 +Version: 0.1.181210 Release: 1 Group: Applications License: Apache-2.0 -- 2.7.4 From c235fbf703f50047ec956e1527531ab56a4ecdf9 Mon Sep 17 00:00:00 2001 From: Hermet Park Date: Thu, 7 Feb 2019 20:52:02 +0900 Subject: [PATCH 11/16] fix wrong edc usage. There are invalid part, state, program references. They are catched by edje_cc, removed abnormal usages all. Change-Id: I415ca7e5b66e9671c4ceb12aeac62813dd2dcc48 --- res/mobile/edje/w-input-stt-button.edc | 3 ++- res/mobile/edje/w-input-stt.edc | 3 ++- res/tv/edje/w-input-stt-button.edc | 3 ++- res/tv/edje/w-input-stt.edc | 3 ++- res/wearable/edje/w-input-stt-button.edc | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/res/mobile/edje/w-input-stt-button.edc b/res/mobile/edje/w-input-stt-button.edc index c8865f4..cc6c063 100644 --- a/res/mobile/edje/w-input-stt-button.edc +++ b/res/mobile/edje/w-input-stt-button.edc @@ -70,7 +70,7 @@ description \ * */ #define BTN_IMAGE() \ -part \ +rect \ { \ name, "button_image"; \ mouse_events, 1; \ @@ -78,6 +78,7 @@ part \ description \ { \ state, "default" 0.0; \ + color, 0 0 0 0; \ } \ description \ { \ diff --git a/res/mobile/edje/w-input-stt.edc b/res/mobile/edje/w-input-stt.edc index 082731d..cf8fdda 100644 --- a/res/mobile/edje/w-input-stt.edc +++ b/res/mobile/edje/w-input-stt.edc @@ -910,7 +910,7 @@ collections target, "PROGRESS_BAR"; target, "MIC_ICON"; } - +/* program { name, "text_show"; @@ -928,6 +928,7 @@ collections action, STATE_SET "default" 0.0; target, "elm.text"; } +*/ program { name, "show_effect_part"; diff --git a/res/tv/edje/w-input-stt-button.edc b/res/tv/edje/w-input-stt-button.edc index c8865f4..cc6c063 100644 --- a/res/tv/edje/w-input-stt-button.edc +++ b/res/tv/edje/w-input-stt-button.edc @@ -70,7 +70,7 @@ description \ * */ #define BTN_IMAGE() \ -part \ +rect \ { \ name, "button_image"; \ mouse_events, 1; \ @@ -78,6 +78,7 @@ part \ description \ { \ state, "default" 0.0; \ + color, 0 0 0 0; \ } \ description \ { \ diff --git a/res/tv/edje/w-input-stt.edc b/res/tv/edje/w-input-stt.edc index 082731d..cf8fdda 100644 --- a/res/tv/edje/w-input-stt.edc +++ b/res/tv/edje/w-input-stt.edc @@ -910,7 +910,7 @@ collections target, "PROGRESS_BAR"; target, "MIC_ICON"; } - +/* program { name, "text_show"; @@ -928,6 +928,7 @@ collections action, STATE_SET "default" 0.0; target, "elm.text"; } +*/ program { name, "show_effect_part"; diff --git a/res/wearable/edje/w-input-stt-button.edc b/res/wearable/edje/w-input-stt-button.edc index c8865f4..cc6c063 100644 --- a/res/wearable/edje/w-input-stt-button.edc +++ b/res/wearable/edje/w-input-stt-button.edc @@ -70,7 +70,7 @@ description \ * */ #define BTN_IMAGE() \ -part \ +rect \ { \ name, "button_image"; \ mouse_events, 1; \ @@ -78,6 +78,7 @@ part \ description \ { \ state, "default" 0.0; \ + color, 0 0 0 0; \ } \ description \ { \ -- 2.7.4 From 273256e214041305f1516680b1f323830f49ff4d Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Mon, 11 Feb 2019 10:48:32 +0900 Subject: [PATCH 12/16] Update package version to 0.1.190211 Change-Id: I6766875a7b06e6128c99cc04f50f72e7f2fe2805 Signed-off-by: Jihoon Kim --- org.tizen.inputdelegator.xml | 2 +- packaging/org.tizen.inputdelegator.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/org.tizen.inputdelegator.xml b/org.tizen.inputdelegator.xml index 4967493..c907721 100644 --- a/org.tizen.inputdelegator.xml +++ b/org.tizen.inputdelegator.xml @@ -1,5 +1,5 @@ - + diff --git a/packaging/org.tizen.inputdelegator.spec b/packaging/org.tizen.inputdelegator.spec index b560348..9c6ca6d 100755 --- a/packaging/org.tizen.inputdelegator.spec +++ b/packaging/org.tizen.inputdelegator.spec @@ -9,7 +9,7 @@ Name: org.tizen.inputdelegator Summary: Input Delegator Application -Version: 0.1.181210 +Version: 0.1.190211 Release: 1 Group: Applications License: Apache-2.0 -- 2.7.4 From 05b89986246c1db3f41c1d204ac6c95e0deb371e Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Wed, 29 Jan 2020 19:03:27 +0900 Subject: [PATCH 13/16] Remove unreachable code Change-Id: Ia39d1878f5c8460a78008495358b37a00cfe9e51 Signed-off-by: Jihoon Kim --- src/w-input-smartreply.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/w-input-smartreply.cpp b/src/w-input-smartreply.cpp index aa1f5e6..8a758af 100644 --- a/src/w-input-smartreply.cpp +++ b/src/w-input-smartreply.cpp @@ -74,11 +74,6 @@ static void _input_smartreply_get_reply_callback(int handle, int error, return; } - if (g_input_smartreply_data == NULL) { - PRINTFUNC(DLOG_ERROR, "InputSmartreplyData uninitialized"); - return; - } - if (g_input_smartreply_data->candidate_list) { int ret; -- 2.7.4 From e99e35669cc83208247246636766d6b75c043416 Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Wed, 29 Jan 2020 19:04:31 +0900 Subject: [PATCH 14/16] Update package version to 0.1.190211 Change-Id: I9afab1f447a28fa989e381305e37ccd98ac1bda7 Signed-off-by: Jihoon Kim --- packaging/org.tizen.inputdelegator.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/org.tizen.inputdelegator.spec b/packaging/org.tizen.inputdelegator.spec index 9c6ca6d..a8ce7d7 100755 --- a/packaging/org.tizen.inputdelegator.spec +++ b/packaging/org.tizen.inputdelegator.spec @@ -9,7 +9,7 @@ Name: org.tizen.inputdelegator Summary: Input Delegator Application -Version: 0.1.190211 +Version: 0.1.200129 Release: 1 Group: Applications License: Apache-2.0 -- 2.7.4 From 0e76f4a5a7c562df60e10aa00e5fab9cd981b756 Mon Sep 17 00:00:00 2001 From: InHong Han Date: Thu, 27 Feb 2020 13:17:04 +0900 Subject: [PATCH 15/16] Fix issue detected by static analysis tool Change-Id: I349b60ae94fa18a15c0d6f5329f8f394d1004cae --- src/w-input-selector.cpp | 45 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 35 insertions(+), 10 deletions(-) diff --git a/src/w-input-selector.cpp b/src/w-input-selector.cpp index 1658c9d..4f5422c 100644 --- a/src/w-input-selector.cpp +++ b/src/w-input-selector.cpp @@ -586,7 +586,8 @@ void set_source_caller_app_id(app_control_h app_control) if (caller){ PRINTFUNC(DLOG_DEBUG, "caller = %s", caller); - app_control_add_extra_data(app_control, "caller_appid", caller); + if (app_control_add_extra_data(app_control, "caller_appid", caller) != APP_CONTROL_ERROR_NONE) + LOGE("app_control_add_extra_data() is failed"); free(caller); } } @@ -600,18 +601,29 @@ void reply_to_sender_by_callback(const char *value, const char *type, const char if (app_control_create(&app_control) == 0) { int ret; - if (value) - app_control_add_extra_data(app_control, APP_CONTROL_DATA_TEXT, value); + if (value) { + ret = app_control_add_extra_data(app_control, APP_CONTROL_DATA_TEXT, value); + if (ret != APP_CONTROL_ERROR_NONE) + LOGE("app_control_add_extra_data() is failed : %d", ret); + } - if (type) - app_control_add_extra_data(app_control, "reply_type", type); + if (type) { + ret = app_control_add_extra_data(app_control, "reply_type", type); + if (ret != APP_CONTROL_ERROR_NONE) + LOGE("app_control_add_extra_data() is failed : %d", ret); + } if (path != NULL) { - app_control_add_extra_data_array(app_control, APP_CONTROL_DATA_PATH, path, 1); + ret = app_control_add_extra_data_array(app_control, APP_CONTROL_DATA_PATH, path, 1); + if (ret != APP_CONTROL_ERROR_NONE) + LOGE("app_control_add_extra_data_array() is failed : %d", ret); } - if (cursor_position != NULL) - app_control_add_extra_data(app_control, "cursor_position_get", cursor_position); + if (cursor_position != NULL) { + ret = app_control_add_extra_data(app_control, "cursor_position_get", cursor_position); + if (ret != APP_CONTROL_ERROR_NONE) + LOGE("app_control_add_extra_data() is failed : %d", ret); + } set_source_caller_app_id(app_control); @@ -634,7 +646,9 @@ void reply_to_sender_by_callback_for_back() if (app_control_create(&app_control) == 0) { int ret; - app_control_add_extra_data(app_control, "back_to_composer", "yes"); + ret = app_control_add_extra_data(app_control, "back_to_composer", "yes"); + if (ret != APP_CONTROL_ERROR_NONE) + LOGE("app_control_add_extra_data() is failed : %d", ret); ret = app_control_reply_to_launch_request(app_control, app_data->source_app_control, APP_CONTROL_RESULT_SUCCEEDED); if (ret != APP_CONTROL_ERROR_NONE) @@ -1338,11 +1352,17 @@ void _app_service(app_control_h service, void* user_data) char **user_template_array = NULL; int user_template_array_len = -1; - app_control_clone(&(app_data->source_app_control), service); + ret = app_control_clone(&(app_data->source_app_control), service); + if (ret != APP_CONTROL_ERROR_NONE) + LOGE("app_control_clone() is failed : %d", ret); + app_data->reply_type = REPLY_APP_NORMAL; app_data->mime_type = MIME_TYPE_ALL; ret = app_control_get_extra_data_array(service, "user_template", &user_template_array, &user_template_array_len); + if (ret != APP_CONTROL_ERROR_NONE) + LOGE("app_control_get_extra_data_array() is failed : %d", ret); + g_input_template_data.input_template_array = user_template_array; g_input_template_data.input_template_array_len = user_template_array_len; @@ -1385,8 +1405,13 @@ void _app_service(app_control_h service, void* user_data) } ret = app_control_is_extra_data_array(service, APP_CONTROL_DATA_INPUT_TYPE, &is_extra_data_array); + if (ret != APP_CONTROL_ERROR_NONE) + LOGE("app_control_is_extra_data_array() is failed : %d", ret); + if ( is_extra_data_array == true) { ret = app_control_get_extra_data_array(service, APP_CONTROL_DATA_INPUT_TYPE, &input_type_array, &input_type_array_len); + if (ret != APP_CONTROL_ERROR_NONE) + LOGE("app_control_get_extra_data_array() is failed : %d", ret); g_input_type_data.input_type_array = input_type_array; g_input_type_data.input_type_array_len = input_type_array_len; } else { -- 2.7.4 From 8a58dc71744f57499befce58fcd963ddec7e0eee Mon Sep 17 00:00:00 2001 From: InHong Han Date: Thu, 27 Feb 2020 13:23:28 +0900 Subject: [PATCH 16/16] Update package version to 0.1.200227 Change-Id: I625db499f560edf12410d34aeff20fd13a11c992 --- org.tizen.inputdelegator.xml | 2 +- packaging/org.tizen.inputdelegator.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/org.tizen.inputdelegator.xml b/org.tizen.inputdelegator.xml index c907721..6e03d7b 100644 --- a/org.tizen.inputdelegator.xml +++ b/org.tizen.inputdelegator.xml @@ -1,5 +1,5 @@ - + diff --git a/packaging/org.tizen.inputdelegator.spec b/packaging/org.tizen.inputdelegator.spec index a8ce7d7..759c57b 100755 --- a/packaging/org.tizen.inputdelegator.spec +++ b/packaging/org.tizen.inputdelegator.spec @@ -9,7 +9,7 @@ Name: org.tizen.inputdelegator Summary: Input Delegator Application -Version: 0.1.200129 +Version: 0.1.200227 Release: 1 Group: Applications License: Apache-2.0 -- 2.7.4