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

Change-Id: I9b7c914da3d1da9df07591a2cff7229824fb00dd
Signed-off-by: Priya Kohli <priya.kohli@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 b3400bc4a37f534d4738e013ad588bd381ceda10..cd473ac24df512c8335b1e1a9a27f2633d9e4a01 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 34a4a55f555a9fffd0f7b78124f737b5e987d9ad..3575194c9e1bc252a4adee6aef675eda9e2d6895 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 4d4c35a3548356f411c51bfbfcf28f5f09b6999b..478b27aa747ad2626a07f89207494bed8e12797a 100644 (file)
--- a/tbtcoreapp/inc/model/tbt-info.h
+++ b/tbtcoreapp/inc/model/tbt-info.h
@@ -171,7 +171,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 0c6014611188aa3baa251ba5e4acf4fbe2660bd6..e3460032a751be199e58757d94c7ec2517e45b80 100644 (file)
--- a/tbtcoreapp/inc/utils/app_module_config.h
+++ b/tbtcoreapp/inc/utils/app_module_config.h
@@ -178,7 +178,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
 
 

diff --git a/tbtcoreapp/src/model/tbt-list.c b/tbtcoreapp/src/model/tbt-list.c
index d92f2cb2e092f15664b9446e20ebd5c082709951..61df3fc55453d276c5d693aac939958cb3fa6940 100644 (file)
--- a/tbtcoreapp/src/model/tbt-list.c
+++ b/tbtcoreapp/src/model/tbt-list.c
@@ -1896,20 +1896,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 = "View Audio Jack <br/>Insert Info",
-                       .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 c94f5b8fc6f59e0a5d0ad7ea9004cc8083c44854..045ad8369e95c643247fe9a63d77172d76012aef 100644 (file)
--- a/tbtcoreapp/src/view/tbt-genlist-view.c
+++ b/tbtcoreapp/src/view/tbt-genlist-view.c
@@ -1095,9 +1095,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
index a4bd899cf3cb006ad89fcb76172d8cefba1b2253..bbfdb3607666422141b017429d76ed216b53f7ad 100644 (file)
--- 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);
@@ -499,51 +498,6 @@ runtimeinfo_view *runtimeinfo_view_add(Evas_Object *navi, tbt_info *tbt_info, El
                elm_object_part_content_set(this->view->layout, "1cnt", 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, "1cnt", 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);
@@ -925,45 +879,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;
-       }
-
-
 }
 
 /**