From: Jin Yoon <jinny.yoon@samsung.com>
Date: Tue, 11 Jun 2013 09:05:02 +0000 (+0900)
Subject: Merge with Private
X-Git-Tag: submit/tizen_2.2/20130714.152534~13^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d1aa59ec93633c302f67e31a3b8741eeec662cdd;p=apps%2Fhome%2Fmenu-screen.git

Merge with Private
---

diff --git a/org.tizen.menu-screen.rule b/org.tizen.menu-screen.rule
index 8b4006d..6638446 100644
--- a/org.tizen.menu-screen.rule
+++ b/org.tizen.menu-screen.rule
@@ -75,3 +75,6 @@ org.tizen.menu-screen pkgmgr::info r
 org.tizen.menu-screen system::vconf_system rw
 org.tizen.menu-screen system::vconf_inhouse rw
 org.tizen.menu-screen aul::launch x
+org.tizen.menu-screen data-provider-master::shortcut rw
+org.tizen.menu-screen data-provider-master::badge rw
+org.tizen.menu-screen data-provider-master::notification rw
\ No newline at end of file
diff --git a/src/all_apps/layout.c b/src/all_apps/layout.c
index e79f628..7411306 100644
--- a/src/all_apps/layout.c
+++ b/src/all_apps/layout.c
@@ -82,20 +82,6 @@ HAPI void all_apps_layout_unedit(Evas_Object *all_apps)
 
 
 
-static void _press_edit_button(Evas_Object *edje)
-{
-	edje_object_signal_emit(edje, "edit_button,enable,press", "menu");
-}
-
-
-
-static void _release_edit_button(Evas_Object *edje)
-{
-	edje_object_signal_emit(edje, "edit_button,enable,release", "menu");
-}
-
-
-
 static char *_access_info_cb(void *data, Evas_Object *obj)
 {
 	Evas_Object *scroller = data;
@@ -141,61 +127,20 @@ static void _focus_clicked_cb(void *data, Evas_Object *obj, void *event_info)
 
 static void _edit_button_down_cb(void *data, Evas_Object *obj, const char* emission, const char* source)
 {
-	Evas_Object *scroller = data;
-
 	_D("Edit button is down");
-
-	if (page_scroller_is_edited(scroller)) {
-		_press_edit_button(obj);
-	}
 }
 
 
 
 static void _edit_button_up_cb(void *data, Evas_Object *obj, const char* emission, const char* source)
 {
-	Evas_Object *scroller = data;
-	Evas_Object *all_apps;
-
 	_D("Edit button is up");
 
-	all_apps = evas_object_data_get(scroller, "tab");
-	if (page_scroller_is_edited(scroller)) {
-		Evas_Object *eo;
-		bool pressed = false;
-
-		eo = evas_object_data_get(obj, "evas_object");
-		pressed = (bool) evas_object_data_get(eo, "pressed");
-		if (pressed) {
-			all_apps_layout_unedit(all_apps);
-		} else {
-			_release_edit_button(obj);
-		}
-	} else {
-		all_apps_layout_edit(all_apps);
-	}
-
 	elm_object_signal_emit(obj, "edit_button,release", "menu");
 }
 
 
 
-static void _button_out_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
-{
-	_D("Edit button is out");
-	evas_object_data_set(obj, "pressed", (void *) false);
-}
-
-
-
-static void _button_in_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
-{
-	_D("Edit button is in");
-	evas_object_data_set(obj, "pressed", (void *) true);
-}
-
-
-
 static Evas_Object *_add_edit_button(Evas_Object *parent, Evas_Object *scroller)
 {
 	Evas_Object *button;
@@ -208,9 +153,6 @@ static Evas_Object *_add_edit_button(Evas_Object *parent, Evas_Object *scroller)
 
 	edje_object_signal_callback_add(_EDJ(button), "edit_button,down", "menu", _edit_button_down_cb, scroller);
 	edje_object_signal_callback_add(_EDJ(button), "edit_button,up", "menu", _edit_button_up_cb, scroller);
-	evas_object_event_callback_add(button, EVAS_CALLBACK_MOUSE_OUT, _button_out_cb, NULL);
-	evas_object_event_callback_add(button, EVAS_CALLBACK_MOUSE_IN, _button_in_cb, NULL);
-	evas_object_data_set(button, "pressed", (void *) false);
 
 	do { // focus
 		Evas_Object *focus= NULL;
@@ -242,9 +184,6 @@ static void _remove_edit_button(Evas_Object *button)
 
 	edje_object_signal_callback_del(_EDJ(button), "edit_button,down", "menu", _edit_button_down_cb);
 	edje_object_signal_callback_del(_EDJ(button), "edit_button,up", "menu", _edit_button_up_cb);
-	evas_object_event_callback_del(button, EVAS_CALLBACK_MOUSE_OUT, _button_out_cb);
-	evas_object_event_callback_del(button, EVAS_CALLBACK_MOUSE_IN, _button_in_cb);
-	evas_object_data_del(button, "pressed");
 
 	layout_unload_edj(button);
 }
diff --git a/src/item_event.c b/src/item_event.c
index 6e0534e..7102449 100644
--- a/src/item_event.c
+++ b/src/item_event.c
@@ -72,7 +72,6 @@ static void _item_down_cb(void *data, Evas_Object *obj, const char* emission, co
 
 static void _item_up_cb(void *data, Evas_Object *obj, const char* emission, const char* source)
 {
-	Evas_Object *scroller;
 	Evas_Object *icon_image;
 	Evas_Object *item;
 
@@ -91,16 +90,6 @@ static void _item_up_cb(void *data, Evas_Object *obj, const char* emission, cons
 		return;
 	}
 	item_event_info.pressed_item = NULL;
-
-	if (mouse_is_scrolling()) return;
-
-	scroller = evas_object_data_get(item, "scroller");
-	ret_if(NULL == scroller);
-
-	if (true == page_scroller_is_edited(scroller)) {
-		return;
-	}
-	item_launch(item);
 }
 
 
@@ -118,7 +107,6 @@ static void _uninstall_up_cb(void *item, Evas_Object *obj, const char* emission,
 {
 	Evas_Object *win;
 	Evas_Object *scroller;
-	char *package;
 
 	ret_if(mouse_is_scrolling());
 
@@ -132,14 +120,6 @@ static void _uninstall_up_cb(void *item, Evas_Object *obj, const char* emission,
 	ret_if(NULL == evas_object_data_get(obj, "removing"));
 
 	evas_object_data_del(obj, "removing");
-
-	package = item_get_package(obj);
-	ret_if(!package || strlen(package) == 0);
-	ret_if(pkgmgr_find_pended_object(package, 0, scroller, NULL));
-
-	_D("Uninstalling... [%s]", package);
-
-	popup_create_uninstall(win, item);
 }