[TBT][sd-card][Non-ACR][Removed SD-Card tetstcase from wearable] 25/134925/1
authornibha.sharma <nibha.sharma@samsung.com>
Tue, 20 Jun 2017 09:03:08 +0000 (14:33 +0530)
committernibha.sharma <nibha.sharma@samsung.com>
Tue, 20 Jun 2017 09:03:08 +0000 (14:33 +0530)
Change-Id: I372c341710fd4f594d978fcd7cd7d7f9c2aac7bd
Signed-off-by: nibha.sharma <nibha.sharma@samsung.com>
release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.tpk
release/binary-x86/org.tizen.tbtcoreapp-1.0.0-x86.tpk
tbtcoreapp/inc/utils/app_module_config.h
tbtcoreapp/inc/view/tbt-storage-view.h [deleted file]
tbtcoreapp/src/model/tbt-list.c
tbtcoreapp/src/view/tbt-genlist-view.c
tbtcoreapp/src/view/tbt-storage-view.c [deleted file]

index 29a7c080b7aaf0261444642da15d3093df5c8122..e0a5451a60a0e89deddf470e93891277ec3d6c17 100644 (file)
Binary files a/release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.tpk and b/release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.tpk differ
index 90526d642f06a7da75b3c2daa055a89a8874ab1c..067289588e28a43c316f679fbfc49c77af16d2ea 100644 (file)
Binary files a/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-x86.tpk and b/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-x86.tpk differ
index e2d26de2a535076fbb0d83cb91a52eb3839257bc..4dfdab822995602a1491c18778e8dbf8861819f3 100644 (file)
 #define TBT_MODULE_APP_NSD_SSDP_LOCAL
 #define TBT_MODULE_APP_NSD_SSDP_REMOTE
 
-#define TBT_MODULE_STORAGE
-#define TBT_MODULE_APP_STORAGE
-
 #define TBT_MODULE_RADIO
 #define TBT_MODULE_APP_RADIO
 
diff --git a/tbtcoreapp/inc/view/tbt-storage-view.h b/tbtcoreapp/inc/view/tbt-storage-view.h
deleted file mode 100644 (file)
index 421235a..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
- *
- *  Licensed under the Apache License, Version 2.0 (the License);
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- *******************************************************************************/
-/**
- * @file       tbt-storage-view.h
- * @brief      retrieves runtime info
- * @since_tizen 3.0
- * @author     Nibha Sharma(nibha.sharma@samsung.com)
- * @date       June, 2016
- * @bug                none
- * @credit
- * @credit
- *
- */
-
-#ifndef __TBT_STORAGE_VIEW_H__
-#define __TBT_STORAGE_VIEW_H__
-
-#include "utils/app_module_config.h"
-#ifdef TBT_MODULE_STORAGE
-
-#include <Evas.h>
-#include "model/tbt-list.h"
-#include <storage.h>
-
-
-/**
- * @typedef storage_viewer_view
- * @since_tizen 3.0
- * @brief A storage viewer view handle.
- */
-typedef struct _storage_view storage_view;
-
-/**
- * @brief Create storage view
- * @since_tizen 3.0 
- * @param[in] navi Parent naviframe
- * @param[in] custom structute to hold tbt application information
- * @param[in] item of the main tbt menu
- * @return Pointer of storage on success, otherwise NULL
- */
-storage_view *storage_view_add(Evas_Object *navi, tbt_info *tbt_info, Elm_Object_Item *item);
-
-#endif
-#endif // __TBT_STORAGE_VIEW_H__
index 51056d42faefd4c7a23bd1488fdeac70acb7fe67..aba0f60c2db21cfc774bcaba99bdb001942703a5 100644 (file)
@@ -2041,20 +2041,6 @@ static tbt_info tbtapps[] =
                },
        #endif
 #endif
-#ifdef TBT_MODULE_STORAGE
-       #ifdef TBT_MODULE_APP_STORAGE
-
-               //Storage
-               {
-                       .name = "SD-Card",
-                       .parent = "Storage",
-                       .apptype = TBT_APP_STORAGE,
-                       .icon_name = "dummy",
-                       .info = "Check Sd-Card <br/>",
-                       .result = 0
-               },
-       #endif
-#endif
 #ifdef TBT_MODULE_RADIO
        #ifdef TBT_MODULE_APP_RADIO
 
index 8de7365cbb39c94a8834eeab40a02f8e9feb1a73..b38b9968725bfe92d62a37e5f7268c8497a2c9f6 100644 (file)
@@ -85,7 +85,6 @@
 #include "view/tbt-mtp-view.h"
 #include "view/tbt-nsd-dns-sd-view.h"
 #include "view/tbt-nsd-ssdp-view.h"
-#include "view/tbt-storage-view.h"
 #include "view/tbt-radio-view.h"
 #include "view/tbt-sound-manager-view.h"
 #include "view/tbt-media-key-view.h"
@@ -1140,11 +1139,6 @@ static void _gl_item_selected_cb(void *data, Evas_Object *obj EINA_UNUSED, void
                                break;
                #endif
 
-               #ifdef TBT_MODULE_STORAGE
-                       case TBT_APP_STORAGE:
-                               storage_view_add(view->navi, info, it);
-                               break;
-               #endif
                #ifdef TBT_MODULE_RADIO
                        case TBT_APP_RADIO:
                                radio_view_add(view->navi, info, it);
diff --git a/tbtcoreapp/src/view/tbt-storage-view.c b/tbtcoreapp/src/view/tbt-storage-view.c
deleted file mode 100755 (executable)
index 65ea561..0000000
+++ /dev/null
@@ -1,219 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
- *
- *  Licensed under the Apache License, Version 2.0 (the License);
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *******************************************************************************/
-/**
- * @file       tbt-runtimeinfo-view.c
- * @brief      retrieves runtime info
- *
- * @author     Nibha Sharma(nibha.sharma@samsung.com)
- * @date       June, 2016
- * @bug                none
- * @credit
- *
- */
-#include "utils/app_module_config.h"
-#ifdef TBT_MODULE_STORAGE
-
-#include <Elementary.h>
-#include <locations.h>
-
-#include "utils/logger.h"
-#include "utils/config.h"
-#include "utils/ui-utils.h"
-#include "view/tbt-storage-view.h"
-#include "view/tbt-common-view.h"
-
-struct _storage_view
-{
-       common_view* view;
-
-       Evas_Object *info_label;
-};
-
-static void _app_destroy_cb(void* this);
-static void _storage_state_changed_cb(int storage_id, storage_state_e state, void *user_data);
-bool storage_device_supported_cb_p(int storage_id, storage_type_e type, storage_state_e state, const char *path, void *user_data);
-
-static int StorageID;
-static bool is_not_supported = false;
-
-/**
- * @function           get_storage_error
- * @since_tizen                3.0
- * @description                Get Storage Error
- * @parameter          int: Int
- * @return             char*
- */
-char* get_storage_type_error(int ret)
-{
-       char* err_msg = NULL;
-       switch (ret) {
-       case STORAGE_ERROR_NONE:
-               err_msg = "STORAGE_ERROR_NONE";
-               break;
-       case STORAGE_ERROR_INVALID_PARAMETER:
-               err_msg = "STORAGE_ERROR_INVALID_PARAMETER";
-               break;
-       case STORAGE_ERROR_OUT_OF_MEMORY:
-               err_msg = "STORAGE_ERROR_OUT_OF_MEMORY";
-               break;
-       case STORAGE_ERROR_NOT_SUPPORTED:
-               err_msg = "STORAGE_ERROR_NOT_SUPPORTED";
-               break;
-       case STORAGE_ERROR_OPERATION_FAILED:
-               err_msg = "STORAGE_ERROR_OPERATION_FAILED";
-               break;
-       default:
-               err_msg = "Unknown Error";
-               break;
-       }
-
-       return err_msg;
-}
-
-
-
-/**
-* @function            storage_device_supported_cb_p
-* @description         callback for supported devices
-* @parameter           storage_id : storage id, type : storage type, state : state, path : storage path, user_data : user data passed to callback
-* @return                      bool
-*/
-bool storage_device_supported_cb_p(int storage_id, storage_type_e type, storage_state_e state, const char *path, void *user_data)
-{
-       StorageID = 0;
-       storage_view *this = NULL;
-       this = (storage_view*) user_data;
-       if(type == STORAGE_TYPE_EXTERNAL)
-        {
-                StorageID=storage_id;
-                return false;
-        }
-        return true;
-}
-
-/**
- * @function           storage_view_add
- * @since_tizen                3.0
- * @description                storage View Add
- * @parameter          Evas_Object*: Evas Object Pointer, tbt_info*: Tbt Info Pointer, Elm_Object_Item*: Elm Object Item Pointer
- * @return             storage_view*
- */
-storage_view *storage_view_add(Evas_Object *navi, tbt_info *tbt_info, Elm_Object_Item *item)
-{
-       RETVM_IF(NULL == navi, NULL, "navi is null");
-       int ret;
-       storage_view *this = NULL;
-       this = calloc(1, sizeof(storage_view));
-       RETVM_IF(!this, NULL, "calloc failed");
-
-       this->view = calloc(1, sizeof(common_view));
-       RETVM_IF(!this->view, NULL, "calloc failed");
-
-       tbt_info->layout_group = "2_part_cnt_btn";
-       tbt_info->layout_file = get_edje_path("2_part_cnt3.5_btn.edj");
-
-       common_view_add(navi, tbt_info, item, this->view, _app_destroy_cb, this);
-       RETVM_IF(NULL == this->view, NULL, "navi is null");
-
-       ret = storage_foreach_device_supported(storage_device_supported_cb_p, this);
-       RETVM_IF(ret != STORAGE_ERROR_NONE && ret != STORAGE_ERROR_NOT_SUPPORTED, NULL, "storage_foreach_device_supported       failed : %s", get_storage_type_error(ret));
-       if(ret == STORAGE_ERROR_NOT_SUPPORTED)
-       {
-                 is_not_supported = true;
-                 Evas_Object *popup = ui_utils_popup_add(this->view->navi, "Message");
-                 elm_object_text_set(popup, "Storage is not supported");
-                 RETVM_IF(!this->view, NULL,"Storage is not supported");
-       }
-               
-       ret = storage_set_state_changed_cb(StorageID, _storage_state_changed_cb, this);
-       RETVM_IF(ret != STORAGE_ERROR_NONE, NULL, "storage_set_state_changed_cb failed : %s", get_storage_type_error(ret));
-                
-       this->info_label = ui_utils_label_add(this->view->layout, "Please Change SD Card state[Remove/Insert]");
-       elm_label_line_wrap_set(this->info_label, ELM_WRAP_WORD);
-       
-       elm_object_part_content_set(this->view->layout, "1cnt", this->info_label);
-
-    return this;
-}
-
-
-/**
- * @function           _app_destroy_cb
- * @since_tizen                2.3
- * @description                 App Destroy Cb
- * @parameter          void*: Void Pointer
- * @return             static void
- */
-static void _app_destroy_cb(void* this)
-{
-
-       RETM_IF(NULL == this, "data is NULL");
-
-       storage_view *view = NULL;
-       view = (storage_view*)this;
-       RETM_IF(NULL == view, "view is NULL");
-
-       if(is_not_supported == true)
-       {
-               view->view->tbt_info->result = TBT_INFO_RESULT_NOT_SUPPORTED;
-               elm_genlist_item_update(view->view->item);
-       }
-
-       int ret = storage_unset_state_changed_cb( StorageID, _storage_state_changed_cb);
-       RETM_IF(ret != STORAGE_ERROR_NONE, "storage_unset_state_changed_cb fail > Error = %s", get_storage_type_error(ret));
-
-       SAFE_DELETE(view->view);
-       SAFE_DELETE(view);
-}
-
-
-/**
- * @function           storage_state_changed_cb
- * @since_tizen                3.0
- * @description                 storage Info Changed Cb
- * @parameter          int storage_id, storage_state_e state, void *user_data
- * @return             void
- */
-static void _storage_state_changed_cb(int storage_id, storage_state_e state, void *user_data)
-{
-
-       RETM_IF(NULL == user_data, "user_data is null");
-       storage_view *this = NULL;
-       this = (storage_view*) user_data;
-       
-       DBG("value: %d", state);
-
-       switch (state) 
-       {
-       case STORAGE_STATE_UNMOUNTABLE:
-                       ui_utils_label_set_text(this->info_label, "STORAGE_STATE_UNMOUNTABLE", "left");
-                       break;
-       case STORAGE_STATE_REMOVED:
-                       ui_utils_label_set_text(this->info_label, "STORAGE_STATE_REMOVED", "left");
-                       break;
-       case STORAGE_STATE_MOUNTED:
-                       ui_utils_label_set_text(this->info_label, "STORAGE_STATE_MOUNTED", "left");
-                       break;
-       case STORAGE_STATE_MOUNTED_READ_ONLY:
-                       ui_utils_label_set_text(this->info_label, "STORAGE_STATE_MOUNTED_READ_ONLY", "left");
-                       break;
-       default:
-                       ui_utils_label_set_text(this->info_label, "unknown state", "left");
-                       break;
-       }
-}
-
-#endif