[TIZENIOT-2002]Removed icon

[TIZENIOT-2007]Show popup before reboot
[TIZENIOT-2008]Change Button text

Change-Id: Ia204ed2d06c490d4364209e187de5fe8bd479047
Signed-off-by: Amritanshu <a.pandia1@samsung.com>

diff --git a/src/interaction.c b/src/interaction.c
index ee8dc9d48a8d8542421feeabed3545485bc0dd4e..a61a42867ef04341f3c850c48e81c85f0eed172e 100755 (executable)
--- a/src/interaction.c
+++ b/src/interaction.c
@@ -121,9 +121,23 @@ _send_notification_local_recovery_cb(void *data, Evas_Object *obj, void *event_i
 static void\r
 _local_recovery_device_reboot_cb(void *data, Evas_Object *obj, void *event_info)\r
 {\r
-       LOGI("Inside _download_image_cb");\r
+       LOGI("Inside _local_recovery_device_reboot_cb");\r
        Evas_Object *nf = data;\r
 \r
+       char title[PATH_MAX];\r
+       snprintf(title, sizeof(title), "Recovering. Don't turn off your device");\r
+\r
+       Evas_Object *popup = elm_popup_add(nf);\r
+       elm_popup_align_set(popup, ELM_NOTIFY_ALIGN_FILL, 1.0);\r
+       evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);\r
+       elm_object_part_text_set(popup, "title,text", title);\r
+\r
+       eext_object_event_callback_add(popup, EEXT_CALLBACK_BACK, _popup_hide_cb, NULL);\r
+       evas_object_smart_callback_add(popup, "dismissed", _popup_hide_finished_cb, NULL);\r
+       evas_object_smart_callback_add(popup, "block,clicked", _popup_block_clicked_cb, NULL);\r
+\r
+       evas_object_show(popup);\r
+\r
        /* Reboot device to start recovery */\r
        int ret = device_power_reboot("recovery");\r
        LOGI("device_power_reboot API return : %d", ret);\r
@@ -131,8 +145,6 @@ _local_recovery_device_reboot_cb(void *data, Evas_Object *obj, void *event_info)
        if (ret == -1 || WEXITSTATUS(ret) != 0) {\r
                recovery_failed_show_popup(nf, ret);\r
        }\r
-\r
-       elm_popup_dismiss(nf);\r
 }\r
 \r
 void recovery_show_popup(Evas_Object *nf, char *title, char *image_path)\r
@@ -159,10 +171,10 @@ void recovery_show_popup(Evas_Object *nf, char *title, char *image_path)
        elm_object_part_content_set(popup, "button1", btn1);\r
        evas_object_smart_callback_add(btn1, "clicked", _send_notification_local_recovery_cb, popup);\r
 \r
-       /* Download button */\r
+       /* Recover button */\r
        Evas_Object *btn2 = elm_button_add(popup);\r
        //elm_object_style_set(btn2, "popup");\r
-       elm_object_text_set(btn2, "Download");\r
+       elm_object_text_set(btn2, "Recover");\r
        elm_object_part_content_set(popup, "button2", btn2);\r
        evas_object_smart_callback_add(btn2, "clicked", _local_recovery_device_reboot_cb, nf);\r
 \r

diff --git a/tizen-manifest.xml b/tizen-manifest.xml
index 6ba33743e0c8f51cef4344e56b223464a548fd45..1ba45edf072a50b96c1410089af4951bf7d1b81c 100755 (executable)
--- a/tizen-manifest.xml
+++ b/tizen-manifest.xml
@@ -3,7 +3,6 @@
     <profile name="tizeniot"/>\r
     <ui-application appid="org.tizen.local-recovery-ui" exec="local-recovery-ui" launch_mode="single" multiple="false" nodisplay="false" taskmanage="true" type="capp">\r
         <label>local-recovery-ui</label>\r
-        <icon>local-recovery-ui.png</icon>\r
         <metadata key="tizen-recovery-manager" value="client"/>\r
     </ui-application>\r
     <privileges>\r