From d50262a75406feb401b0672ae5db1f4049785582 Mon Sep 17 00:00:00 2001 From: "Geunsun, Lee" Date: Wed, 5 Oct 2016 21:42:55 +0900 Subject: [PATCH 01/16] [TSAM-8480] 'Unnamed folder' Text not clear when tap Change-Id: Idc0e389e093422888442fd53357be83c3380ab69 --- src/apps_view.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/src/apps_view.c b/src/apps_view.c index b5cd44c..13f69e0 100755 --- a/src/apps_view.c +++ b/src/apps_view.c @@ -155,6 +155,9 @@ static int __apps_view_get_index(int page_index, int x, int y); static void __apps_view__set_icon_label_style(app_data_t *item, view_state_t state); static void __apps_view_folder_entry_done_cb(void *data, Evas_Object *obj, void *event_info); +static void __apps_view_folder_entry_focused_cb(void *data, Evas_Object *obj, void *event_info); +static void __apps_view_folder_entry_unfocused_cb(void *data, Evas_Object *obj, void *event_info); + Evas_Object *apps_view_create(Evas_Object *win) { @@ -1132,13 +1135,15 @@ static void __apps_view_open_folder_popup(app_data_t *item) elm_entry_scrollable_set(entry, EINA_TRUE); evas_object_show(entry); - char style_string[STR_MAX] = {0, }; + char style_string[STR_MAX] = { 0, }; snprintf(style_string, sizeof(style_string), "%s", _("IDS_COM_HEADER_UNNAMED_FOLDER")); elm_object_part_text_set(entry, "elm.guide", style_string); elm_entry_input_panel_return_key_type_set(entry, ELM_INPUT_PANEL_RETURN_KEY_TYPE_DONE); - evas_object_smart_callback_add(entry, "activated", __apps_view_folder_entry_done_cb, entry); + evas_object_smart_callback_add(entry, "activated", __apps_view_folder_entry_done_cb, NULL); + evas_object_smart_callback_add(entry, "focused", __apps_view_folder_entry_focused_cb, NULL); + evas_object_smart_callback_add(entry, "unfocused", __apps_view_folder_entry_unfocused_cb, NULL); elm_entry_text_style_user_push(entry, "DEFAULT='font=Tizen:style=Regular align=center color=#4DE7FFFF font_size=40 wrap=none'"); elm_entry_entry_set(entry, apps_view_s.opened_folder->label_str); @@ -1818,3 +1823,15 @@ static void __apps_view_folder_entry_done_cb(void *data, Evas_Object *obj, void elm_entry_input_panel_hide(obj); elm_object_focus_set(obj, EINA_FALSE); } + +static void __apps_view_folder_entry_focused_cb(void *data, Evas_Object *obj, void *event_info) +{ + elm_object_part_text_set(obj, "elm.guide", ""); +} + +static void __apps_view_folder_entry_unfocused_cb(void *data, Evas_Object *obj, void *event_info) +{ + char style_string[STR_MAX] = { 0, }; + snprintf(style_string, sizeof(style_string), "%s", _("IDS_COM_HEADER_UNNAMED_FOLDER")); + elm_object_part_text_set(obj, "elm.guide", style_string); +} -- 2.7.4 From 794576ea3a4e1f01795344804e39ba4cd3c7174f Mon Sep 17 00:00:00 2001 From: "Geunsun, Lee" Date: Wed, 5 Oct 2016 21:47:21 +0900 Subject: [PATCH 02/16] Add log for app install. If nodisplay option is true, the log will be showing. Change-Id: I96faaeae81c2aee9cea602a7436b7edc3bd4b39e --- src/apps_package_manager.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/apps_package_manager.c b/src/apps_package_manager.c index e7b953d..ef46a96 100755 --- a/src/apps_package_manager.c +++ b/src/apps_package_manager.c @@ -113,8 +113,10 @@ static bool __apps_data_pkg_get_apps_info(app_info_h app_handle, app_data_t **it *item = new_item; app_info_is_nodisplay(app_handle, &nodisplay); - if (nodisplay) + if (nodisplay) { + LOGD("Nodisplay is TRUE"); goto ERROR; + } new_item->db_id = INIT_VALUE; new_item->parent_db_id = APPS_ROOT; -- 2.7.4 From 43fda43ab3611df4805723cdf8060d0ca9b22137 Mon Sep 17 00:00:00 2001 From: junkyu han Date: Tue, 11 Oct 2016 15:51:40 +0900 Subject: [PATCH 03/16] Can create layout if there's something wrong with certain widget Change-Id: Iace5ccce05018d0af60c67122c5076e8da285dd3 --- .cproject | 44 ++++++++++++++++++++++++++----- .project | 6 ++--- Build/basedef.mk | 40 +++++++++++++++++----------- Build/build_edc.mk | 6 ++--- Build/build_po.mk | 2 +- Build/makefile.mk | 28 ++++++++++++-------- Build/platform.mk | 15 +++++++++++ Build/tooldef.mk | 13 --------- project_def.prop | 37 +++++++++----------------- src/add_widget_viewer/add_widget_data.c | 9 ++++--- src/add_widget_viewer/add_widget_viewer.c | 3 +-- 11 files changed, 121 insertions(+), 82 deletions(-) create mode 100644 Build/platform.mk diff --git a/.cproject b/.cproject index a070bb9..379025f 100755 --- a/.cproject +++ b/.cproject @@ -27,11 +27,17 @@ @@ -119,6 +127,7 @@ +