[TBT][runtimeinfo][ACR-1345][Remove code of location manager runtime info deprecated...

Change-Id: If123d8a26f7b6c6d16ccc447551e78f2cafb7142
Signed-off-by: Nibha Sharma <nibha.sharma@samsung.com>

diff --git a/release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.tpk b/release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.tpk
index 4e14c1b15c25e91e28d07f12a187b783535a7c8f..ee35b47ff771862fbba0856621916f9d04460df8 100755 (executable)
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

diff --git a/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-x86.tpk b/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-x86.tpk
index f7ca9490dfefe471be63fb530e5de852290ee4eb..7e55e2509a0ae54b0a408b63441013ec7e3a38b0 100755 (executable)
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

diff --git a/tbtcoreapp/inc/model/tbt-info.h b/tbtcoreapp/inc/model/tbt-info.h
index 56bb63486dc62bfe23a2c9806eeb8948f5101259..19d0337f780eb2f4751624d2df866f24708f8429 100755 (executable)
--- a/tbtcoreapp/inc/model/tbt-info.h
+++ b/tbtcoreapp/inc/model/tbt-info.h
@@ -168,7 +168,6 @@ typedef enum {
        TBT_APP_USB_CONNECTED,
        TBT_APP_BLUETOOTH_ENABLED,
        TBT_APP_AUTO_ROTATION_ENABLED,
-       TBT_APP_LOCATION_SERVICE_ENABLED,
        TBT_APP_WIFI_HOTSPOT_ENABLED,
 
        TBT_APP_SCREEN_MIRROR_SINK,

diff --git a/tbtcoreapp/inc/utils/app_module_config.h b/tbtcoreapp/inc/utils/app_module_config.h
index 2c902d8de5057d876ceb660476c49a4803558360..85ec874f8626a49dd258d48af90a381fc022ebb1 100755 (executable)
--- a/tbtcoreapp/inc/utils/app_module_config.h
+++ b/tbtcoreapp/inc/utils/app_module_config.h
@@ -175,7 +175,6 @@
 #define        TBT_MODULE_APP_USB_CONNECTED
 #define        TBT_MODULE_APP_BLUETOOTH_ENABLED
 #define        TBT_MODULE_APP_AUTO_ROTATION_ENABLED
-#define        TBT_MODULE_APP_LOCATION_SERVICE_ENABLED
 #define        TBT_MODULE_APP_WIFI_HOTSPOT_ENABLED
 
 //#define TBT_MODULE_SCREEN_MIRROR

diff --git a/tbtcoreapp/src/model/tbt-list.c b/tbtcoreapp/src/model/tbt-list.c
index 38a640f50c428340d89dc7fe84c2a69b11fc2efd..57d14c10f2ab01f338c3ddd709e7a483ee466457 100755 (executable)
--- a/tbtcoreapp/src/model/tbt-list.c
+++ b/tbtcoreapp/src/model/tbt-list.c
@@ -1901,22 +1901,6 @@ static tbt_info tbtapps[] =
                        .features_required = {FEATURE_SCREEN_AUTO_ROTATION}
                },
        #endif
-       #ifdef TBT_MODULE_APP_LOCATION_SERVICE_ENABLED
-
-               //Runtime Info
-               {
-                       .name = "Location Status",
-                       .parent = "Runtime Info",
-                       .apptype = TBT_APP_LOCATION_SERVICE_ENABLED,
-                       .icon_name = "dummy",
-                       .info = "1. <b>Enable/Disable</b> Location from <b>Settings</b> app.<br/>"
-                                       "1. <b>Location is Not Enabled</b> message will be shown if Location is disabled from <b>Settings</b> app.<br/>"
-                                       "2. <b>Location is Enabled</b> message will be shown if Location is enabled from <b>Settings</b> app.<br/>",
-                       .result = 0,
-                       .required_features_count = 1,
-                       .features_required = {FEATURE_LOCATION}
-               },
-       #endif
        #ifdef TBT_MODULE_APP_WIFI_HOTSPOT_ENABLED
 
                //Runtime Info

diff --git a/tbtcoreapp/src/view/tbt-genlist-view.c b/tbtcoreapp/src/view/tbt-genlist-view.c
index 0ed916f7396dc605244ca20f24ae69bbf1785164..d20bd8fcb615cc1070df60c8c0dc1124707de295 100755 (executable)
--- a/tbtcoreapp/src/view/tbt-genlist-view.c
+++ b/tbtcoreapp/src/view/tbt-genlist-view.c
@@ -995,9 +995,6 @@ static void _gl_item_selected_cb(void *data, Evas_Object *obj EINA_UNUSED, void
                        case TBT_APP_AUTO_ROTATION_ENABLED:
                                runtimeinfo_view_add(view->navi, info, it);
                                break;
-                       case TBT_APP_LOCATION_SERVICE_ENABLED:
-                               runtimeinfo_view_add(view->navi, info, it);
-                               break;
                        case TBT_APP_WIFI_HOTSPOT_ENABLED:
                                runtimeinfo_view_add(view->navi, info, it);
                                break;

diff --git a/tbtcoreapp/src/view/tbt-runtimeinfo-view.c b/tbtcoreapp/src/view/tbt-runtimeinfo-view.c
old mode 100644 (file)
new mode 100755 (executable)
index 3021fc3..5fb111c
--- a/tbtcoreapp/src/view/tbt-runtimeinfo-view.c
+++ b/tbtcoreapp/src/view/tbt-runtimeinfo-view.c
@@ -53,7 +53,6 @@ static void _usb_state_changed_cb(runtime_info_key_e key, void *user_data);
 static void _gps_state_changed_cb(runtime_info_key_e key, void *user_data);
 static void _bluetooth_state_changed_cb(runtime_info_key_e key, void *user_data);
 static void _rotate_state_changed_cb(runtime_info_key_e key, void *user_data);
-static void _location_state_changed_cb(runtime_info_key_e key, void *user_data);
 static void _wifi_state_changed_cb(runtime_info_key_e key, void *user_data);
 
 static void _position_updated_cb(double latitude, double longitude, double altitude, time_t timestamp, void *data);
@@ -500,51 +499,6 @@ runtimeinfo_view *runtimeinfo_view_add(Evas_Object *navi, tbt_info *tbt_info, El
                elm_object_part_content_set(this->view->layout, "info_text", this->info_label);
                return this;
        }
-       else if (this->view->tbt_info->apptype == TBT_APP_LOCATION_SERVICE_ENABLED)
-       {
-               
-                       ret = runtime_info_set_changed_cb(RUNTIME_INFO_KEY_LOCATION_SERVICE_ENABLED   , _location_state_changed_cb, this);
-                       RETVM_IF(ret != RUNTIME_INFO_ERROR_NONE && ret != RUNTIME_INFO_ERROR_NOT_SUPPORTED, NULL, "runtime_info_set_changed_cb  failed : %s", get_runtime_info_error(ret));
-
-                       this->info_label = ui_utils_label_add(this->view->layout, "location: ");
-                       elm_label_line_wrap_set(this->info_label, ELM_WRAP_WORD);
-
-                       if(ret == RUNTIME_INFO_ERROR_NOT_SUPPORTED)
-                       {
-                               is_not_supported = true;
-                               Evas_Object *popup = ui_utils_popup_add(this->view->navi, "Message");
-                               elm_object_text_set(popup, "Location is not supported");
-                               RETVM_IF(!this->view, NULL,"Location is not supported");
-                       }
-                       else
-                       {
-                               ret = runtime_info_get_value_bool(RUNTIME_INFO_KEY_LOCATION_SERVICE_ENABLED , &bvalue);
-                               RETVM_IF(ret != RUNTIME_INFO_ERROR_NONE && ret != RUNTIME_INFO_ERROR_NOT_SUPPORTED, NULL, "runtime_info_get_value_int failed: %s",get_runtime_info_error(ret));
-                               if(ret == RUNTIME_INFO_ERROR_NOT_SUPPORTED)
-                               {
-                                       is_not_supported = true;
-                                       Evas_Object *popup = ui_utils_popup_add(this->view->navi, "Message");
-                                       elm_object_text_set(popup, "Location is not supported");
-                                       RETVM_IF(!this->view, NULL,"Location is not supported");
-                               }
-                               else
-                               {
-                                       DBG("value: %d", bvalue);
-                                       switch(bvalue)
-                                       {
-                                               case 0:
-                                                       ui_utils_label_set_text(this->info_label, "Location Not Enabled", "left");
-                                                       break;
-
-                                               case 1:
-                                                       ui_utils_label_set_text(this->info_label, "Location is Enabled", "left");
-                                                       break;
-                                       }
-                               }
-                       }
-               elm_object_part_content_set(this->view->layout, "info_text", this->info_label);
-               return this;
-       }
        else if (this->view->tbt_info->apptype == TBT_APP_WIFI_HOTSPOT_ENABLED)
        {
                        ret = runtime_info_set_changed_cb(RUNTIME_INFO_KEY_WIFI_HOTSPOT_ENABLED   , _wifi_state_changed_cb, this);
@@ -928,45 +882,6 @@ static void _rotate_state_changed_cb(runtime_info_key_e key, void *user_data)
        }
 
 
-}
-
-/**
- * @function           _location_state_changed_cb
- * @since_tizen                2.3
- * @description                 location State Changed Cb
- * @parameter          runtime_info_key_e key, void *user_data
- * @return             static void
- */
-static void _location_state_changed_cb(runtime_info_key_e key, void *user_data)
-{
-       RETM_IF(NULL == user_data, "user_data is null");
-       int ret;
-       bool bvalue;
-       runtimeinfo_view *this = NULL;
-       this = (runtimeinfo_view*) user_data;
-
-       ret = runtime_info_get_value_bool(RUNTIME_INFO_KEY_LOCATION_SERVICE_ENABLED  , &bvalue);
-       RETM_IF(ret != RUNTIME_INFO_ERROR_NONE && ret != RUNTIME_INFO_ERROR_NOT_SUPPORTED,"runtime_info_get_value_int failed :%s",get_runtime_info_error(ret));
-       if(ret == RUNTIME_INFO_ERROR_NOT_SUPPORTED)
-       {
-               ui_utils_label_set_text(this->info_label, "Location is not supported", "left");
-               return;
-       }
-
-       DBG("value: %d", bvalue);
-
-       switch(bvalue)
-       {
-               case 0:
-                       ui_utils_label_set_text(this->info_label, "Location Not Enabled", "left");
-                       break;
-
-               case 1:
-                       ui_utils_label_set_text(this->info_label, "Location is Enabled", "left");
-                       break;
-       }
-
-
 }
 
 /**