[Timer]Fix : Display Cancel Resume after tap to x icon when time is upsubmit/tizen_3.0/20161229.001234submit/tizen_3.0/20161228.074545submit/tizen_3.0/20161226.091139tizen_3.0.m2

Change-Id: I13addc873da1e31961a6343a12773aee4fef592f

2 files changed, 12 insertions, 5 deletions

diff --git a/src/main.c b/src/main.c
index 26b1105..357846f 100755
--- a/src/main.c
+++ b/src/main.c
@@ -887,8 +887,13 @@ void _tmr_btn_update(struct appdata *ad)
 	}
 
 }
+static void _reply_from_alert(app_control_h request, app_control_h reply, app_control_result_e result, void *user_data)
+{
+	_D("");
+	_tmr_view_change_to_timeset_cb(user_data);
+}
 
-void _launch_alert()
+void _launch_alert(void* data)
 {
 	_TMR_ENTER_;
 	app_control_h app_control = NULL;
@@ -905,7 +910,7 @@ void _launch_alert()
 	app_control_set_operation(app_control, APP_CONTROL_OPERATION_DEFAULT);
 	app_control_set_app_id(app_control, "org.tizen.timer.alert");
 	app_control_add_extra_data(app_control, "type", "timer");
-	ret = app_control_send_launch_request(app_control, NULL, NULL);
+	ret = app_control_send_launch_request(app_control, _reply_from_alert, data);
 	if (ret != 0)
 		TMR_ERR("ret = %d, launch request is failed", ret);
 
@@ -947,9 +952,7 @@ static Eina_Bool _tmr_timer_cb(void *data)
 		ad->due_time.tv_sec = -1;
 		_tmr_panel_time_update(ad);
 
-		_launch_alert();
-		ecore_timer_add(1.5, _tmr_view_change_to_timeset_cb, ad);
-
+		_launch_alert(ad);
 		return ECORE_CALLBACK_CANCEL;
 	} else {
 		_tmr_panel_time_update(ad);
diff --git a/timer_alert/src/ring.c b/timer_alert/src/ring.c
index 08aabaa..6233428 100755
--- a/timer_alert/src/ring.c
+++ b/timer_alert/src/ring.c
@@ -309,6 +309,10 @@ static void
 app_control(app_control_h app_control, void *data)
 {
 	_TMR_ENTER_;
+	app_control_h reply;
+	app_control_create(&reply);
+	app_control_reply_to_launch_request(reply, app_control, APP_CONTROL_RESULT_SUCCEEDED);
+	app_control_destroy(reply);
 }
 
 static void