[TSAM-11375] Folder cannot open when double tap to folder

Change-Id: I2886ba03fb0cf6c4e3ae9ba6d9d8a6592157a114

diff --git a/src/apps_view.c b/src/apps_view.c
index 1565fe3..190c489 100755 (executable)
--- 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;