From 1e2b1a1750ab076c5bbdc7db1871740ac6661658 Mon Sep 17 00:00:00 2001
From: Seonah Moon <seonah1.moon@samsung.com>
Date: Tue, 19 Jul 2016 16:39:23 +0900
Subject: [PATCH] Add launch_mode to xml file for wearable

Change-Id: If15de73c9a294ae2d68af8dd8883d49e214bcfec
Signed-off-by: Seonah Moon <seonah1.moon@samsung.com>
---
 packaging/wifi-efl-ug.spec                      |  2 +-
 sources/wearable/org.tizen.w-wifi.xml           |  3 +-
 sources/wearable/src/wearable-circle/app_main.c | 39 -------------------------
 3 files changed, 2 insertions(+), 42 deletions(-)

diff --git a/packaging/wifi-efl-ug.spec b/packaging/wifi-efl-ug.spec
index 0f61514..b628195 100644
--- a/packaging/wifi-efl-ug.spec
+++ b/packaging/wifi-efl-ug.spec
@@ -1,7 +1,7 @@
 %define _unpackaged_files_terminate_build 0
 Name:		wifi-efl-ug
 Summary:	Wi-Fi UI Gadget for TIZEN
-Version:	1.0.196
+Version:	1.0.197
 Release:	1
 Group:		App/Network
 License:	Flora-1.1
diff --git a/sources/wearable/org.tizen.w-wifi.xml b/sources/wearable/org.tizen.w-wifi.xml
index 2c7ba04..3d37454 100755
--- a/sources/wearable/org.tizen.w-wifi.xml
+++ b/sources/wearable/org.tizen.w-wifi.xml
@@ -2,7 +2,7 @@
 <manifest xmlns="http://tizen.org/ns/packages" package="org.tizen.w-wifi" api-version="2.3.1" version="${PKG_VERSION}" install-location="internal-only" type="rpm" preload="true">
 	<label>wifi-efl</label>
 	<description>wifi-efl</description>
-	<ui-application appid="org.tizen.w-wifi" exec="/usr/apps/org.tizen.w-wifi/bin/wifi" nodisplay="true" multiple="false" type="capp" taskmanage="false" hw-acceleration="use-GL" effectimage-type="edj-default">
+	<ui-application appid="org.tizen.w-wifi" exec="/usr/apps/org.tizen.w-wifi/bin/wifi" nodisplay="true" multiple="false" type="capp" taskmanage="false" hw-acceleration="use-GL" effectimage-type="edj-default" launch_mode="group">
 		<icon></icon>
 		<label>Wi-Fi</label>
 		<label xml:lang="en-us">Wi-Fi</label>
@@ -11,6 +11,5 @@
 		<privilege>http://tizen.org/privilege/network.get</privilege>
 		<privilege>http://tizen.org/privilege/network.set</privilege>
 		<privilege>http://tizen.org/privilege/network.profile</privilege>
-		<privilege>http://tizen.org/privilege/keygrab</privilege>
 	</privileges>
 </manifest>
diff --git a/sources/wearable/src/wearable-circle/app_main.c b/sources/wearable/src/wearable-circle/app_main.c
index 76937fa..a46637b 100755
--- a/sources/wearable/src/wearable-circle/app_main.c
+++ b/sources/wearable/src/wearable-circle/app_main.c
@@ -679,41 +679,6 @@ static view_base_object *_view_base_create()
 	return base_obj;
 }
 
-static Eina_Bool _homekey_press_cb(void *data, int type, void *event)
-{
-	__WIFI_FUNC_ENTER__;
-	app_object *app_obj = data;
-	Evas_Event_Key_Down *ev = event;
-
-	WIFI_RET_IF_FAIL(app_obj != NULL);
-	WIFI_RET_IF_FAIL(ev != NULL);
-
-	if (app_obj->main && strcmp(ev->keyname, "XF86PowerOff") == 0) {
-		_release_popups(app_obj);
-		layout_main_pop_to(app_obj->main);
-	}
-
-	return ECORE_CALLBACK_RENEW;
-}
-
-static gboolean _app_view_base_callback_init_for_keygrab(app_object *app_obj)
-{
-	Evas_Object *window;
-
-	__WIFI_FUNC_ENTER__;
-
-	if (app_obj->base) {
-		window = view_base_get_window(app_obj->base);
-		if (window) {
-			elm_win_keygrab_set(window, "XF86PowerOff", 0, 0, 0, ELM_WIN_KEYGRAB_SHARED);
-			ecore_event_handler_add(ECORE_EVENT_KEY_DOWN, _homekey_press_cb, app_obj);
-			return TRUE;
-		}
-	}
-
-	return FALSE;
-}
-
 static void __popup_unable_scan_destroy_cb(void *data, Evas_Object *obj, void *event_info)
 {
 	app_object *app_obj = data;
@@ -4124,10 +4089,6 @@ static void _app_service_handle_launch_requested(app_control_h service,
 		WIFI_LOG_ERR("_app_view_base_init() is failed.");
 	}
 
-	if (!_app_view_base_callback_init_for_keygrab(app_obj)) {
-		WIFI_LOG_ERR("_app_view_base_callback_init_for_keygrab() is failed");
-	}
-
 	if (is_scanlist_requested) {
 		_popup_scanning_show(app_obj, FALSE);
 		if (!app_obj->popup_scanning) {
-- 
2.7.4