From 339fca19256c80c391f8ebe424f422318825fce7 Mon Sep 17 00:00:00 2001 From: "Geunsun, Lee" Date: Fri, 9 Dec 2016 19:48:44 +0900 Subject: [PATCH 01/16] [TSAM-11375] Folder cannot open when double tap to folder Change-Id: I2886ba03fb0cf6c4e3ae9ba6d9d8a6592157a114 --- src/apps_view.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/src/apps_view.c b/src/apps_view.c index 1565fe3..190c489 100755 --- a/src/apps_view.c +++ b/src/apps_view.c @@ -2085,8 +2085,19 @@ static void __apps_view_get_access_page_app_icon(Eina_List **list) info->parent = item->app_layout; info->name = (item->label_str) ? strdup(item->label_str) : NULL; if (apps_view_s.view_state == VIEW_STATE_CHOOSER) { - info->description = (item->is_folder) ? strdup(_("IDS_LCKSCN_TBBODY_DOUBLE_TAP_TO_OPEN")) : strdup(_("IDS_HS_TBBODY_DOUBLE_TAP_TO_SELECT")); - info->clicked_cb = __apps_view_icon_check_changed_cb; + if (item->is_folder) { + if (item == apps_view_s.dest_folder) { + free(info->name); + free(info); + continue; + } + + info->description = strdup(_("IDS_LCKSCN_TBBODY_DOUBLE_TAP_TO_OPEN")); + info->clicked_cb = __apps_view_icon_clicked_cb; + } else { + info->description = strdup(_("IDS_HS_TBBODY_DOUBLE_TAP_TO_SELECT")); + info->clicked_cb = __apps_view_icon_check_changed_cb; + } } else { if (item->is_folder) { snprintf(buf, sizeof(buf), "%s, %s", _("IDS_HS_HEADER_FOLDER"), _("IDS_LCKSCN_TBBODY_DOUBLE_TAP_TO_OPEN")); @@ -2187,10 +2198,7 @@ static void __apps_view_get_access_folder_icon(Eina_List **list) info->name = (item->label_str) ? strdup(item->label_str) : NULL; info->description = (apps_view_s.view_state == VIEW_STATE_EDIT) ? strdup(_("IDS_HS_TBBODY_DOUBLE_TAP_AND_HOLD_THEN_DRAG_OUTSIDE_TO_REMOVE_FROM_FOLDER")) : strdup(_("IDS_HS_TBBODY_DOUBLE_TAP_TO_SELECT")); info->role = ELM_ATSPI_ROLE_UNKNOWN; - if (apps_view_s.view_state == VIEW_STATE_CHOOSER) - info->clicked_cb = __apps_view_icon_check_changed_cb; - else - info->clicked_cb = __apps_view_icon_clicked_cb; + info->clicked_cb = (apps_view_s.view_state == VIEW_STATE_CHOOSER) ? __apps_view_icon_check_changed_cb : __apps_view_icon_clicked_cb; info->cb_data = item; info->priority = (item->position + 1) * ACCESS_PRIORITY_APP_ICON; -- 2.7.4 From 774ad223041bd4abab63dd523b1f3847196645ff Mon Sep 17 00:00:00 2001 From: "Geunsun, Lee" Date: Fri, 9 Dec 2016 20:31:53 +0900 Subject: [PATCH 02/16] [Screen Reader] Fix APPS description on edit mode Change-Id: I760cc4a39ff3d853de67229426a8a5037d17888e --- src/apps_view.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/apps_view.c b/src/apps_view.c index 190c489..b2754a0 100755 --- a/src/apps_view.c +++ b/src/apps_view.c @@ -2098,11 +2098,19 @@ static void __apps_view_get_access_page_app_icon(Eina_List **list) info->description = strdup(_("IDS_HS_TBBODY_DOUBLE_TAP_TO_SELECT")); info->clicked_cb = __apps_view_icon_check_changed_cb; } - } else { + } else if (apps_view_s.view_state == VIEW_STATE_EDIT) { if (item->is_folder) { snprintf(buf, sizeof(buf), "%s, %s", _("IDS_HS_HEADER_FOLDER"), _("IDS_LCKSCN_TBBODY_DOUBLE_TAP_TO_OPEN")); } else { - snprintf(buf, sizeof(buf), "%s, %s", _("IDS_LCKSCN_TBBODY_DOUBLE_TAP_TO_OPEN"), _("IDS_BR_BODY_DOUBLE_TAP_AND_HOLD_THEN_DRAG_TO_REORDER_TTS")); + snprintf(buf, sizeof(buf), "%s", _("IDS_BR_BODY_DOUBLE_TAP_AND_HOLD_THEN_DRAG_TO_REORDER_TTS")); + } + info->description = strdup(buf); + info->clicked_cb = __apps_view_icon_clicked_cb; + } else { + if (item->is_folder) { + snprintf(buf, sizeof(buf), "%s, %s, %s", _("IDS_HS_HEADER_FOLDER"), _("IDS_LCKSCN_TBBODY_DOUBLE_TAP_TO_OPEN"), _("IDS_BR_BODY_DOUBLE_TAP_AND_HOLD_THEN_DRAG_TO_REORDER_TTS")); + } else { + snprintf(buf, sizeof(buf), "%s", _("IDS_LCKSCN_TBBODY_DOUBLE_TAP_TO_OPEN")); } info->description = strdup(buf); info->clicked_cb = __apps_view_icon_clicked_cb; -- 2.7.4 From 490a06a8db37eabb91f3f908cc81cd8c3dd18281 Mon Sep 17 00:00:00 2001 From: junkyu han Date: Mon, 12 Dec 2016 15:11:18 +0900 Subject: [PATCH 03/16] Search the storage type on install Change-Id: I94eed83b66744c4bcdffa5e3de9c31f99c65defc --- .cproject | 32 ++++++++++++++++---------------- Build/basedef.mk | 2 +- Build/build_edc.mk | 4 ++-- Build/build_po.mk | 4 ++-- Build/makefile | 3 ++- Build/makefile.mk | 28 +++++++++++++++------------- inc/apps_data.h | 1 + project_def.prop | 2 +- src/apps_data.c | 19 +++++++++++++++++++ src/apps_package_manager.c | 14 +++----------- 10 files changed, 62 insertions(+), 47 deletions(-) diff --git a/.cproject b/.cproject index a6da12c..ab7aa9b 100755 --- a/.cproject +++ b/.cproject @@ -27,11 +27,17 @@