wearable lbs-setting updatedsubmit/tizen/20170906.000745accepted/tizen/unified/20170907.060514

- Fixlauch_app failed
- text missing after &
- radio button behavior changed

Signed-off-by: kj7.sung <kj7.sung@samsung.com>
Change-Id: Ic50da9ce594a01956ccae058fbb269bc972dd56d

2 files changed, 4 insertions, 102 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index cc82fb5..935cc3e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,6 +1,6 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 
-PROJECT(setting-location C)
+PROJECT(setting-location-wearable C)
 
 IF("${CMAKE_BUILD_TYPE}" STREQUAL "")
 	SET(CMAKE_BUILD_TYPE "Release")
diff --git a/src/lbs-setting-window.c b/src/lbs-setting-window.c
index 1862ba9..7b658ac 100644
--- a/src/lbs-setting-window.c
+++ b/src/lbs-setting-window.c
@@ -770,98 +770,10 @@ static void __setting_location_loc_check_cb(void *data, Evas_Object *obj, void *
 	}
 }
 
-static void __setting_location_hybrid_check_cb(void *data, Evas_Object *obj, void *event_info)
-{
-	LS_FUNC_ENTER
-	LS_RETURN_IF_FAILED(data);
-	lbs_setting_app_data *ad = (lbs_setting_app_data *)data;
-	ad->called_by_internal_menu = true;
-	__waiting_radio_focus(MENU_LOCATION, ad);
-
-	if (!ad->is_gps || !ad->is_wifi) {
-		ad->refresh_genlist = false;
-
-		if (!ad->is_gps) {
-			if (ad->consent_gps) {
-				location_gps_popup(ad);
-			} else {
-				ad->refresh_genlist = true;
-				ad->is_gps = true;
-			}
-		} else if (!ad->is_wifi) {
-			if (ad->consent_wifi) {
-				location_wifi_popup(ad);
-			} else {
-				ad->refresh_genlist = true;
-				ad->is_wifi = true;
-			}
-		}
-
-		if (ad->refresh_genlist) {
-			ad->called_by_internal_menu = true;
-			__setting_location_update_radio_values(ad);
-		}
-	}
-}
-
-static void __setting_location_gps_check_cb(void *data, Evas_Object *obj, void *event_info)
-{
-	LS_FUNC_ENTER
-	LS_RETURN_IF_FAILED(data);
-	lbs_setting_app_data *ad = (lbs_setting_app_data *)data;
-	__waiting_radio_focus(MENU_GPS, ad);
-
-	if (ad->is_wifi) {
-		ad->refresh_genlist = true;
-		ad->is_wifi = false;
-		if (!ad->is_gps) {
-			if (ad->consent_gps) {
-				ad->refresh_genlist = false;
-				location_gps_popup(ad);
-			} else {
-				ad->is_gps = true;
-			}
-		}
-
-		if (ad->refresh_genlist) {
-			ad->called_by_internal_menu = true;
-			__setting_location_update_radio_values(ad);
-		}
-	}
-}
-
-static void __setting_location_wifi_check_cb(void *data, Evas_Object *obj, void *event_info)
-{
-	LS_FUNC_ENTER
-	LS_RETURN_IF_FAILED(data);
-	lbs_setting_app_data *ad = (lbs_setting_app_data *)data;
-	ad->called_by_internal_menu = true;
-	__waiting_radio_focus(MENU_WIFI, ad);
-
-	if (ad->is_gps) {
-		ad->refresh_genlist = true;
-		ad->is_gps = false;
-		if (!ad->is_wifi) {
-			if (ad->consent_wifi) {
-				ad->refresh_genlist = false;
-				location_wifi_popup(ad);
-			} else {
-				ad->is_wifi = true;
-			}
-		}
-
-		if (ad->refresh_genlist) {
-			ad->called_by_internal_menu = true;
-			__setting_location_update_radio_values(ad);
-		}
-	}
-}
-
 static Evas_Object *__setting_location_loc_check_get(void *data, Evas_Object *obj, const char *part)
 {
 	lbs_setting_app_data *ad = (lbs_setting_app_data *)data;
 
-//	if (!strcmp(part, "elm.swallow.icon.1")) {
 	if (!strcmp(part, "elm.icon")) {
 		ad->gi_loc_check = elm_check_add(obj);
 
@@ -889,14 +801,11 @@ static Evas_Object *__setting_location_hybrid_radio_get(void *data, Evas_Object
 {
 	lbs_setting_app_data *ad = (lbs_setting_app_data *)data;
 
-//	if (!strcmp(part, "elm.swallow.end")) {
 	if (!strcmp(part, "elm.icon")) {
 		ad->gi_hybrid_check = elm_radio_add(obj);
 		elm_radio_state_value_set(ad->gi_hybrid_check, MENU_HYBRID);
-		elm_object_signal_emit(ad->gi_hybrid_check, "elm,event,repeat,disabled", "elm");
 		elm_radio_group_add(ad->gi_hybrid_check, ad->radio_group);
-		evas_object_propagate_events_set(ad->gi_hybrid_check, EINA_FALSE);
-		evas_object_smart_callback_add(ad->gi_hybrid_check, "changed", __setting_location_hybrid_check_cb, ad);
+		evas_object_propagate_events_set(ad->gi_hybrid_check, EINA_TRUE);
 		evas_object_show(ad->gi_hybrid_check);
 
 		return ad->gi_hybrid_check;
@@ -908,14 +817,11 @@ static Evas_Object *__setting_location_gps_radio_get(void *data, Evas_Object *ob
 {
 	lbs_setting_app_data *ad = (lbs_setting_app_data *)data;
 
-//	if (!strcmp(part, "elm.swallow.end")) {
 	if (!strcmp(part, "elm.icon")) {
 		ad->gi_gps_check = elm_radio_add(obj);
 		elm_radio_state_value_set(ad->gi_gps_check, MENU_GPS);
-		elm_object_signal_emit(ad->gi_gps_check, "elm,event,repeat,disabled", "elm");
 		elm_radio_group_add(ad->gi_gps_check, ad->radio_group);
-		evas_object_propagate_events_set(ad->gi_gps_check, EINA_FALSE);
-		evas_object_smart_callback_add(ad->gi_gps_check, "changed", __setting_location_gps_check_cb, ad);
+		evas_object_propagate_events_set(ad->gi_gps_check, EINA_TRUE);
 		evas_object_show(ad->gi_gps_check);
 
 		return ad->gi_gps_check;
@@ -927,14 +833,11 @@ static Evas_Object *__setting_location_wifi_radio_get(void *data, Evas_Object *o
 {
 	lbs_setting_app_data *ad = (lbs_setting_app_data *)data;
 
-//	if (!strcmp(part, "elm.swallow.end")) {
 	if (!strcmp(part, "elm.icon")) {
 		ad->gi_wifi_check = elm_radio_add(obj);
 		elm_radio_state_value_set(ad->gi_wifi_check, MENU_WIFI);
-		elm_object_signal_emit(ad->gi_wifi_check, "elm,event,repeat,disabled", "elm");
 		elm_radio_group_add(ad->gi_wifi_check, ad->radio_group);
-		evas_object_propagate_events_set(ad->gi_wifi_check, EINA_FALSE);
-		evas_object_smart_callback_add(ad->gi_wifi_check, "changed", __setting_location_wifi_check_cb, ad);
+		evas_object_propagate_events_set(ad->gi_wifi_check, EINA_TRUE);
 		evas_object_show(ad->gi_wifi_check);
 
 		return ad->gi_wifi_check;
@@ -1593,7 +1496,6 @@ int __setting_location_init(lbs_setting_app_data *ad)
 	bool is_supported = false;
 	system_info_get_platform_bool(WPS_FEATURE, &is_supported);
 	ad->wps_feature = is_supported;
-	ad->wps_feature = true;
 
 	ret &= vconf_get_int(VCONFKEY_LOCATION_USE_MY_LOCATION, &enabled);
 	if (enabled) ad->is_myloc = true;