InputKeyboardData g_input_keyboard_data;
InputTypeData g_input_type_data;
+InputTemplateData g_input_template_data;
+
+static bool g_set_mimetype_in_app_service = false;
+static bool g_set_mimetype_in_app_resume = false;
static Elm_Object_Item *it_empty;
static Elm_Object_Item *it_title;
void _update_genlist_items(void *user_data);
unsigned int _update_smartreply_items(void *user_data);
unsigned int _update_template_items(void *user_data);
+unsigned int _update_user_template_items(void *user_data);
static void _popup_close_cb(void *data, Evas_Object *obj, void *event_info);
static void _popup_back_cb(void *data, Evas_Object *obj, void *event_info);
static void input_type_deinit(void);
elm_theme_extension_add(NULL, app_edj_path.c_str());
}
-
static Eina_Bool back_cb(void *data, Elm_Object_Item *it)
{
reply_to_sender_by_callback_for_back();
static void __ise_smartreply_gl_sel(void *data, Evas_Object *obj, void *event_info)
{
- App_Data* app_data = (App_Data*) data;
Elm_Object_Item *item = (Elm_Object_Item *) event_info;
if (item) {
char *reply = input_smartreply_get_nth_item(index, &type);
if (reply) {
input_smartreply_send_feedback(reply);
- reply_to_sender_by_callback(reply, "smartreply", NULL);
+ reply_to_sender_by_callback(reply, "smartreply", NULL, NULL);
free(reply);
elm_exit();
}
const std::vector<TemplateData> template_list = input_template_get_list();
if (index < (int)template_list.size()) {
- reply_to_sender_by_callback(gettext(template_list[index].text.c_str()), "template", NULL);
+ reply_to_sender_by_callback(gettext(template_list[index].text.c_str()), "template", NULL, NULL);
+ ui_app_exit();
+ }
+ }
+}
+
+static void __ise_user_template_gl_sel(void *data, Evas_Object *obj, void *event_info)
+{
+ Elm_Object_Item *item = (Elm_Object_Item *) event_info;
+ int index = 0;
+
+ if (item) {
+ elm_genlist_item_selected_set(item, EINA_FALSE);
+
+ index = (uintptr_t) elm_object_item_data_get(item);
+
+ if (index < (int)g_input_template_data.input_template_array_len) {
+ reply_to_sender_by_callback(g_input_template_data.input_template_array[index], "user_template", NULL, NULL);
ui_app_exit();
}
}
return NULL;
}
+static char * __ise_user_template_gl_text_get(void *data, Evas_Object *obj, const char *part)
+{
+ if (!strcmp(part, "elm.text")) {
+ unsigned int index = (uintptr_t)data;
+ if (index < (unsigned int)g_input_template_data.input_template_array_len) {
+ if (g_input_template_data.input_template_array[index] != NULL) {
+ return strdup(g_input_template_data.input_template_array[index]);
+ }
+ }
+ }
+ return NULL;
+}
+
static Evas_Object * __ise_gl_2button_content_get(void *data, Evas_Object *obj, const char *part)
{
char *first_input_type = *(g_input_type_data.input_type_array + 0);
if (!strcmp(first_input_type, "input_voice")) {
elm_object_style_set(btn, "ime_button_stt");
path_ic = path + "images/w_mode_stt_ic.png";
+ evas_object_smart_callback_add(btn, "clicked", _stt_clicked_cb, app_data);
+ elm_atspi_accessible_name_set(btn, "IDS_IME_MBODY_VOICE_INPUT");
+ elm_atspi_accessible_translation_domain_set(btn, PACKAGE);
} else if (!strcmp(first_input_type, "input_emoticon")) {
elm_object_style_set(btn, "ime_button_emoticon");
path_ic = path + "images/Delta_w_mode_emoticon_ic.png";
+ evas_object_smart_callback_add(btn, "clicked", _emoticon_clicked_cb, app_data);
+ elm_atspi_accessible_name_set(btn, "IDS_COM_HEADER_EMOTICON");
+ elm_atspi_accessible_translation_domain_set(btn, PACKAGE);
} else if (!strcmp(first_input_type, "input_keyboard")) {
elm_object_style_set(btn, "ime_button_keyboard");
path_ic = path + "images/w_mode_keyboard_ic.png";
evas_object_propagate_events_set(btn, EINA_FALSE);
+ evas_object_smart_callback_add(btn, "clicked", _keyboard_clicked_cb, app_data);
+ elm_atspi_accessible_name_set(btn, "IDS_COM_OPT_KEYBOARD");
+ elm_atspi_accessible_translation_domain_set(btn, PACKAGE);
}
elm_image_file_set(ic, path_ic.c_str(), NULL);
elm_object_content_set(btn, ic);
if (!strcmp(second_input_type, "input_voice")) {
elm_object_style_set(btn, "ime_button_stt");
path_ic = path + "images/w_mode_stt_ic.png";
+ evas_object_smart_callback_add(btn, "clicked", _stt_clicked_cb, app_data);
+ elm_atspi_accessible_name_set(btn, "IDS_IME_MBODY_VOICE_INPUT");
+ elm_atspi_accessible_translation_domain_set(btn, PACKAGE);
} else if (!strcmp(second_input_type, "input_emoticon")) {
elm_object_style_set(btn, "ime_button_emoticon");
path_ic = path + "images/Delta_w_mode_emoticon_ic.png";
+ evas_object_smart_callback_add(btn, "clicked", _emoticon_clicked_cb, app_data);
+ elm_atspi_accessible_name_set(btn, "IDS_COM_HEADER_EMOTICON");
+ elm_atspi_accessible_translation_domain_set(btn, PACKAGE);
} else if (!strcmp(second_input_type, "input_keyboard")) {
elm_object_style_set(btn, "ime_button_keyboard");
path_ic = path + "images/w_mode_keyboard_ic.png";
evas_object_propagate_events_set(btn, EINA_FALSE);
+ evas_object_smart_callback_add(btn, "clicked", _keyboard_clicked_cb, app_data);
+ elm_atspi_accessible_name_set(btn, "IDS_COM_OPT_KEYBOARD");
+ elm_atspi_accessible_translation_domain_set(btn, PACKAGE);
}
elm_image_file_set(ic, path_ic.c_str(), NULL);
elm_object_content_set(btn, ic);
evas_object_layer_set(btn, 32000);
if (!strcmp(first_input_type, "input_voice")) {
evas_object_smart_callback_add(btn, "clicked", _stt_clicked_cb, app_data);
+ elm_atspi_accessible_name_set(btn, "IDS_IME_MBODY_VOICE_INPUT");
+ elm_atspi_accessible_translation_domain_set(btn, PACKAGE);
} else if (!strcmp(first_input_type, "input_emoticon")) {
evas_object_smart_callback_add(btn, "clicked", _emoticon_clicked_cb, app_data);
+ elm_atspi_accessible_name_set(btn, "IDS_COM_HEADER_EMOTICON");
+ elm_atspi_accessible_translation_domain_set(btn, PACKAGE);
} else if (!strcmp(first_input_type, "input_keyboard")) {
evas_object_propagate_events_set(btn, EINA_FALSE);
evas_object_smart_callback_add(btn, "clicked", _keyboard_clicked_cb, app_data);
+ elm_atspi_accessible_name_set(btn, "IDS_COM_OPT_KEYBOARD");
+ elm_atspi_accessible_translation_domain_set(btn, PACKAGE);
}
} else if (!strcmp(part, "elm.icon.2.touch_area")){
evas_object_layer_set(btn, 32000);
if (!strcmp(second_input_type, "input_voice")) {
evas_object_smart_callback_add(btn, "clicked", _stt_clicked_cb, app_data);
+ elm_atspi_accessible_name_set(btn, "IDS_IME_MBODY_VOICE_INPUT");
+ elm_atspi_accessible_translation_domain_set(btn, PACKAGE);
} else if (!strcmp(second_input_type, "input_emoticon")) {
evas_object_smart_callback_add(btn, "clicked", _emoticon_clicked_cb, app_data);
+ elm_atspi_accessible_name_set(btn, "IDS_COM_HEADER_EMOTICON");
+ elm_atspi_accessible_translation_domain_set(btn, PACKAGE);
} else if (!strcmp(second_input_type, "input_keyboard")) {
evas_object_propagate_events_set(btn, EINA_FALSE);
evas_object_smart_callback_add(btn, "clicked", _keyboard_clicked_cb, app_data);
+ elm_atspi_accessible_name_set(btn, "IDS_COM_OPT_KEYBOARD");
+ elm_atspi_accessible_translation_domain_set(btn, PACKAGE);
}
}
return btn;
elm_image_file_set(ic, path_ic.c_str(), NULL);
elm_object_content_set(btn, ic);
evas_object_layer_set(btn, 32000);
+ evas_object_smart_callback_add(btn, "clicked", _stt_clicked_cb, app_data);
+ elm_atspi_accessible_name_set(btn, "IDS_IME_MBODY_VOICE_INPUT");
+ elm_atspi_accessible_translation_domain_set(btn, PACKAGE);
} else if (!strcmp(part, "elm.icon.2")){
elm_object_style_set(btn, "ime_button_emoticon");
elm_image_file_set(ic, path_ic.c_str(), NULL);
elm_object_content_set(btn, ic);
evas_object_layer_set(btn, 32000);
+ evas_object_smart_callback_add(btn, "clicked", _emoticon_clicked_cb, app_data);
+ elm_atspi_accessible_name_set(btn, "IDS_COM_HEADER_EMOTICON");
+ elm_atspi_accessible_translation_domain_set(btn, PACKAGE);
} else if (!strcmp(part, "elm.icon.3")){
elm_object_style_set(btn, "ime_button_keyboard");
elm_object_content_set(btn, ic);
evas_object_layer_set(btn, 32000);
evas_object_propagate_events_set(btn, EINA_FALSE);
+ evas_object_smart_callback_add(btn, "clicked", _keyboard_clicked_cb, app_data);
+ elm_atspi_accessible_name_set(btn, "IDS_COM_OPT_KEYBOARD");
+ elm_atspi_accessible_translation_domain_set(btn, PACKAGE);
}
return btn;
if (!strcmp(part, "elm.icon.1.touch_area")) {
evas_object_layer_set(btn, 32000);
evas_object_smart_callback_add(btn, "clicked", _stt_clicked_cb, app_data);
+ elm_atspi_accessible_name_set(btn, "IDS_IME_MBODY_VOICE_INPUT");
+ elm_atspi_accessible_translation_domain_set(btn, PACKAGE);
} else if (!strcmp(part, "elm.icon.2.touch_area")){
evas_object_layer_set(btn, 32000);
evas_object_smart_callback_add(btn, "clicked", _emoticon_clicked_cb, app_data);
+ elm_atspi_accessible_name_set(btn, "IDS_COM_HEADER_EMOTICON");
+ elm_atspi_accessible_translation_domain_set(btn, PACKAGE);
} else if (!strcmp(part, "elm.icon.3.touch_area")) {
evas_object_layer_set(btn, 32000);
evas_object_propagate_events_set(btn, EINA_FALSE);
evas_object_smart_callback_add(btn, "clicked", _keyboard_clicked_cb, app_data);
+ elm_atspi_accessible_name_set(btn, "IDS_COM_OPT_KEYBOARD");
+ elm_atspi_accessible_translation_domain_set(btn, PACKAGE);
}
return btn;
elm_genlist_realized_items_update(obj);
}
+static char * __ise_drawing_text_get(void *data, Evas_Object *obj, const char *part)
+{
+ if(!strcmp(part, "elm.text")) {
+ return(strdup(gettext("WDS_IME_MBODY_DRAWING_M_EMOTICON_ABB")));
+ }
+ return NULL;
+}
+
+static Evas_Object * __ise_drawing_content_get(void *data, Evas_Object *obj, const char *part)
+{
+ if (!strcmp(part, "elm.icon")) {
+ Evas_Object* btn = elm_button_add(obj);
+ evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ Evas_Object* ic = elm_image_add(btn);
+ elm_image_resizable_set(ic, EINA_TRUE, EINA_TRUE);
+ string path = get_resource_path();
+ if (_WEARABLE)
+ path = path + "wearable/";
+ else if (_TV)
+ path = path + "tv/";
+ else
+ path = path + "mobile/";
+ elm_object_style_set(btn, "ime_button_drawing");
+ string path_ic = path + "images/wi_drawing_icon.png";
+ elm_image_file_set(ic, path_ic.c_str(), NULL);
+ elm_object_content_set(btn, ic);
+ evas_object_layer_set(btn, 32000);
+ return btn;
+ }
+ return NULL;
+}
+
void set_source_caller_app_id(app_control_h app_control)
{
if (!app_control){
}
}
-void reply_to_sender_by_callback(const char *value, const char *type, const char *path[])
+void reply_to_sender_by_callback(const char *value, const char *type, const char *path[], const char *cursor_position)
{
PRINTFUNC(DLOG_DEBUG, "");
app_control_add_extra_data_array(app_control, APP_CONTROL_DATA_PATH, path, 1);
}
+ if (cursor_position != NULL)
+ app_control_add_extra_data(app_control, "cursor_position_get", cursor_position);
+
set_source_caller_app_id(app_control);
ret = app_control_reply_to_launch_request(app_control, app_data->source_app_control, APP_CONTROL_RESULT_SUCCEEDED);
}
if (app_data->app_type == APP_TYPE_STT || app_data->app_type == APP_TYPE_EMOTICON || app_data->app_type == APP_TYPE_KEYBOARD){
PRINTFUNC(DLOG_DEBUG, "launched as STT/EMOTICON/KEYBOARD mode, So exit here.");
- reply_to_sender_by_callback(NULL, NULL, NULL);
+ reply_to_sender_by_callback(NULL, NULL, NULL, NULL);
ui_app_exit();
}
}
}
}
-static char *
-_main_menu_title_text_get(void *data, Evas_Object *obj, const char *part)
-{
- char buf[1024];
-
- snprintf(buf, 1023, "%s", "Select method");
- return strdup(buf);
-}
-
void _create_genlist_items(void* user_data)
{
App_Data* app_data = (App_Data*) user_data;
elm_genlist_clear(app_data->genlist);
Elm_Genlist_Item_Class * itc0 = elm_genlist_item_class_new();
- itc0->item_style = "title";
- itc0->func.text_get = _main_menu_title_text_get;
+ itc0->item_style = NULL;
+ itc0->func.text_get = NULL;
itc0->func.content_get = NULL;
itc0->func.state_get = NULL;
itc0->func.del = NULL;
ELM_GENLIST_ITEM_NONE,
NULL, NULL);
- // 3 Buttons
- it_title = elm_genlist_item_append(app_data->genlist, itc1,
- NULL, NULL,
- ELM_GENLIST_ITEM_NONE,
- NULL, NULL);
+ if (app_data->app_type != APP_TYPE_REPLY) {
+ // 3 Buttons
+ it_title = elm_genlist_item_append(app_data->genlist, itc1,
+ NULL, NULL,
+ ELM_GENLIST_ITEM_NONE,
+ NULL, NULL);
+ }
elm_genlist_item_select_mode_set(it_title, ELM_OBJECT_SELECT_MODE_NONE);
g_template_item_size = _update_template_items(user_data);
+ if (g_input_template_data.input_template_array_len > 0) {
+ _update_user_template_items(user_data);
+ }
+
/* Update genlist item position */
Elm_Object_Item *item = elm_genlist_item_next_get(it_title);
elm_genlist_item_show(item, ELM_GENLIST_ITEM_SCROLLTO_MIDDLE);
App_Data* app_data;
Elm_Object_Item *first;
- Elm_Object_Item *menu;
- Elm_Object_Item *pos;
unsigned int i = 0;
unsigned int len = 0;
/* Move to smartreply */
first = elm_genlist_first_item_get(app_data->genlist);
- menu = elm_genlist_item_next_get(first);
+ elm_genlist_item_next_get(first);
if (input_smartreply_is_enabled() == false)
return item_size;
itc->func.state_get = NULL;
itc->func.del = NULL;
- pos = menu;
-
for (i = 0; i < len; i++) {
- char *reply = "hello";
+ char *reply = (char *)"hello";
unsigned int j;
bool matched;
reply = input_smartreply_get_nth_item(i, &type);
if (reply == NULL)
continue;
- PRINTFUNC(DLOG_DEBUG, "SmartReply = [%d]%s", i, reply);
-
+ SECURE_LOGD("SmartReply = [%d]%s", i, reply);
for (j = 0; j < template_list.size(); j++) {
const char *template_str;
}
}
- if (matched == true)
+ if (matched == true) {
+ free(reply);
continue;
+ }
- pos = elm_genlist_item_append(app_data->genlist,
+ elm_genlist_item_append(app_data->genlist,
itc,
(void *)(uintptr_t)i,
NULL,
app_data);
item_size++;
- if (item_size >= 3)
+ free(reply);
+ if (item_size >= 3) {
break;
+ }
}
elm_genlist_item_class_free(itc);
}
return item_size;
}
+static void _drawing_item_clicked_cb(void *data, Evas_Object * obj, void *event_info)
+{
+ PRINTFUNC(DLOG_DEBUG, "%s", __func__);
+ App_Data* ad = (App_Data*) data;
+ if (!ad)
+ return;
+
+ launch_drawing_app(ad);
+}
unsigned int _update_template_items(void *user_data)
{
item_size++;
}
elm_genlist_item_class_free(itc);
+
+ // drawing button (+)
+ if (app_data->mime_type == MIME_TYPE_ALL && app_data->app_type == APP_TYPE_SELECT_MODE) {
+ Elm_Genlist_Item_Class *itc;
+ itc = elm_genlist_item_class_new();
+
+ itc->item_style = "1text.1icon";
+ itc->func.text_get = __ise_drawing_text_get;;
+ itc->func.content_get = __ise_drawing_content_get;
+ itc->func.state_get = NULL;
+ itc->func.del = NULL;
+
+ elm_genlist_item_append(app_data->genlist,
+ itc,
+ NULL,
+ NULL,
+ ELM_GENLIST_ITEM_NONE,
+ _drawing_item_clicked_cb,
+ app_data);
+
+ elm_genlist_item_class_free(itc);
+ }
+
+ // dummy item for empty space
+ Elm_Genlist_Item_Class * itc0 = elm_genlist_item_class_new();
+ itc0->item_style = "title";
+ itc0->func.text_get = NULL;
+ itc0->func.content_get = NULL;
+ itc0->func.state_get = NULL;
+ itc0->func.del = NULL;
+
+ if (g_input_template_data.input_template_array_len < 1) {
+ it_empty = elm_genlist_item_append(app_data->genlist, itc0,
+ NULL, NULL,
+ ELM_GENLIST_ITEM_NONE,
+ NULL, NULL);
+ }
+ elm_genlist_item_class_free(itc0);
+ }
+
+ return item_size;
+}
+
+unsigned int _update_user_template_items(void *user_data)
+{
+ App_Data* app_data;
+
+ Elm_Object_Item *first;
+
+ unsigned int i = 0;
+ unsigned int item_size = 0;
+
+ app_data = (App_Data *)user_data;
+
+ if (app_data == NULL) {
+ PRINTFUNC(DLOG_ERROR, "Can not get app_data");
+ return item_size;
+ }
+
+ if (app_data->genlist == NULL) {
+ /* smartreply will update when genlist is exist only */
+ PRINTFUNC(DLOG_ERROR, "Can not get getlist");
+ return item_size;
+ }
+
+ first = elm_genlist_first_item_get(app_data->genlist);
+ if (first == NULL)
+ return 0;
+
+ if (g_input_template_data.input_template_array_len > 0) {
+ Elm_Genlist_Item_Class *itc;
+
+ itc = elm_genlist_item_class_new();
+
+ itc->item_style = "1text";
+ itc->func.text_get = __ise_user_template_gl_text_get;
+ itc->func.content_get = NULL;
+ itc->func.state_get = NULL;
+ itc->func.del = NULL;
+
+ for (i = 0; i < (unsigned int)g_input_template_data.input_template_array_len; i++) {
+ elm_genlist_item_append(app_data->genlist,
+ itc,
+ (void *)(uintptr_t)i,
+ NULL,
+ ELM_GENLIST_ITEM_NONE,
+ __ise_user_template_gl_sel,
+ app_data);
+ item_size++;
+ }
+ elm_genlist_item_class_free(itc);
+
+ // dummy item for empty space
+ Elm_Genlist_Item_Class * itc0 = elm_genlist_item_class_new();
+ itc0->item_style = "title";
+ itc0->func.text_get = NULL;
+ itc0->func.content_get = NULL;
+ itc0->func.state_get = NULL;
+ itc0->func.del = NULL;
+
+ it_empty = elm_genlist_item_append(app_data->genlist, itc0,
+ NULL, NULL,
+ ELM_GENLIST_ITEM_NONE,
+ NULL, NULL);
+ elm_genlist_item_class_free(itc0);
}
return item_size;
int input_type_array_len = -1;
bool is_extra_data_array = false;
char *mime_type = NULL;
+ char **user_template_array = NULL;
+ int user_template_array_len = -1;
app_control_clone(&(app_data->source_app_control), service);
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);
+ g_input_template_data.input_template_array = user_template_array;
+ g_input_template_data.input_template_array_len = user_template_array_len;
+
+ g_set_mimetype_in_app_service = false;
ret = app_control_get_mime(service, &mime_type);
if (ret != APP_CONTROL_ERROR_NONE) {
if (mime_type) {
LOGD("mime type = %s", mime_type);
if (!strncmp(mime_type, "image/", strlen("image/"))) {
-
- } else if(!strncmp(mime_type, "audio/", strlen("audio/"))) {
+ app_data->mime_type = MIME_TYPE_IMAGE;
+ app_data->app_type = APP_TYPE_DRAWING;
+ g_set_mimetype_in_app_service = true;
+ launch_drawing_app((void *)app_data);
+ if (mime_type)
+ free(mime_type);
+ goto ACTIVATE;
+ } else if (!strncmp(mime_type, "audio/", strlen("audio/"))) {
+ app_data->mime_type = MIME_TYPE_AUDIO;
app_data->app_type = APP_TYPE_STT;
_stt_clicked_cb((void *)app_data, NULL, NULL);
if (mime_type)
free(mime_type);
goto ACTIVATE;
+ } else if (!strncmp(mime_type, "text/", strlen("text/"))) {
+ app_data->mime_type = MIME_TYPE_TEXT;
}
}
}
app_data->app_type = APP_TYPE_STT;
_stt_clicked_cb((void *)app_data, NULL, NULL);
goto ACTIVATE;
+ } else if (!strcmp(context, "input_recording")) {
+ app_data->app_type = APP_TYPE_RECORDING;
+ _stt_clicked_cb((void *)app_data, NULL, NULL);
+ goto ACTIVATE;
} else if (!strcmp(context, "input_emoticon")) {
app_data->app_type = APP_TYPE_EMOTICON;
_emoticon_clicked_cb((void *)app_data, NULL, NULL);
input_keyboard_init(service);
_keyboard_clicked_cb((void *)app_data, NULL, NULL);
goto ACTIVATE;
+ } else if (!strcmp(context, "input_drawing")) {
+ app_data->app_type = APP_TYPE_DRAWING;
+ _drawing_item_clicked_cb((void *)app_data, NULL, NULL);
+ goto ACTIVATE;
} else if (!strcmp(context, "input_reply")) {
app_data->app_type = APP_TYPE_REPLY;
}
free(context);
}
-
void _app_pause(void* user_data)
{
PRINTFUNC(DLOG_DEBUG, "");
void _app_resume(void* user_data)
{
PRINTFUNC(DLOG_DEBUG, "");
+ resume_voice();
+
+ if (g_set_mimetype_in_app_resume) {
+ app_control_destroy(app_data->source_app_control);
+ app_data->source_app_control = NULL;
+ ui_app_exit();
+ }
+
+ if (g_set_mimetype_in_app_service) {
+ g_set_mimetype_in_app_resume = true;
+ }
}
void _app_terminate(void* user_data)
projects / platform / core / uifw / inputdelegator.git / blobdiff