[TSAM-6471] Move implementation to app_servicesubmit/tizen/20160819.042643submit/tizen/20160718.084923accepted/tizen/wearable/20160819.063544accepted/tizen/wearable/20160718.105301accepted/tizen/mobile/20160819.063603accepted/tizen/mobile/20160718.105312accepted/tizen/common/20160819.131151accepted/tizen/common/20160718.160108

Change-Id: Ic97d412bf019874f139907a357b6582058c241ae

3 files changed, 29 insertions, 31 deletions

diff --git a/packaging/ug-nfc-efl.spec b/packaging/ug-nfc-efl.spec
index 6dd65fe..bc83d31 100644
--- a/packaging/ug-nfc-efl.spec
+++ b/packaging/ug-nfc-efl.spec
@@ -16,7 +16,7 @@ ExcludeArch: %{arm} %ix86 x86_64
 
 Name:       ug-nfc-efl
 Summary:    NFC Setting UI
-Version:    3.1.2
+Version:    3.1.3
 Release:    0
 Group:      App/Network
 License:    Flora-1.1
diff --git a/wearable/app/src/nsa-main.c b/wearable/app/src/nsa-main.c
index c9136fa..30ccae7 100755
--- a/wearable/app/src/nsa-main.c
+++ b/wearable/app/src/nsa-main.c
@@ -83,34 +83,6 @@ bool _nsa_main_app_create(void *user_data)
 	if (nfc_manager_initialize() != NFC_ERROR_NONE)
 		NSA_DEBUG_ERR("nfc_manager_initialize failed");
 
-	/* create window */
-	ad->main_win = nsa_create_main_win(APPNAME);
-	retv_if(ad->main_win == NULL, false);
-
-	/* create conformant */
-	ad->conform = nsa_create_conformant(ad->main_win);
-	retv_if(ad->conform == NULL, false);
-
-	/* create circle surface */
-	ad->circle_surface = eext_circle_surface_conformant_add(ad->conform);
-	retv_if(ad->circle_surface == NULL, false);
-
-	/* create bg */
-	ad->main_bg = nsa_create_bg(ad->conform);
-	retv_if(ad->main_bg == NULL, false);
-
-	/* create base layout */
-	ad->main_layout = nsa_create_main_layout(ad->conform);
-	retv_if(ad->main_layout == NULL, false);
-
-	/* create naviframe */
-	ad->navi_frame = elm_naviframe_add(ad->main_layout);
-	retv_if(ad->navi_frame == NULL, false);
-
-	elm_object_part_content_set(ad->main_layout, "elm.swallow.content", ad->navi_frame);
-	evas_object_show(ad->navi_frame);
-	eext_object_event_callback_add(ad->navi_frame, EEXT_CALLBACK_BACK, __back_clicked_cb, ad);
-
 	NSA_DEBUG("_nsa_main_app_create end");
 
 	return true;
@@ -138,6 +110,33 @@ void _nsa_main_app_service(app_control_h service, void *user_data)
 
 	ret_if(ad == NULL);
 
+	/* create window */
+	ad->main_win = nsa_create_main_win(APPNAME);
+	retv_if(ad->main_win == NULL, false);
+
+	/* create conformant */
+	ad->conform = nsa_create_conformant(ad->main_win);
+	retv_if(ad->conform == NULL, false);
+
+	/* create circle surface */
+	ad->circle_surface = eext_circle_surface_conformant_add(ad->conform);
+	retv_if(ad->circle_surface == NULL, false);
+
+	/* create bg */
+	ad->main_bg = nsa_create_bg(ad->conform);
+	retv_if(ad->main_bg == NULL, false);
+
+	/* create base layout */
+	ad->main_layout = nsa_create_main_layout(ad->conform);
+	retv_if(ad->main_layout == NULL, false);
+
+	/* create naviframe */
+	ad->navi_frame = elm_naviframe_add(ad->main_layout);
+	retv_if(ad->navi_frame == NULL, false);
+
+	elm_object_part_content_set(ad->main_layout, "elm.swallow.content", ad->navi_frame);
+	eext_object_event_callback_add(ad->navi_frame, EEXT_CALLBACK_BACK, __back_clicked_cb, ad);
+
 	_nsa_view_main_create(ad);
 	elm_win_activate(ad->main_win);
 
diff --git a/wearable/app/src/nsa-ui-widget.c b/wearable/app/src/nsa-ui-widget.c
index f5e59d1..1e8e677 100755
--- a/wearable/app/src/nsa-ui-widget.c
+++ b/wearable/app/src/nsa-ui-widget.c
@@ -48,8 +48,7 @@ Evas_Object* nsa_create_main_win(const char *name)
 		evas_object_resize(eo, w, h);
 	}
 
-	/* prevent the black screen flashing * /
-	/* evas_object_show(eo); */
+	evas_object_show(eo);
 
 	NSA_END();
 	return eo;