[TIZENIOT-1995]Makes the popup bg disappear, [TIZENIOT-1996]Makes popup not disappear...

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

diff --git a/src/interaction.c b/src/interaction.c
index a61a42867ef04341f3c850c48e81c85f0eed172e..038846887608b06857a3e9df5c48d1143dff5d7d 100755 (executable)
--- a/src/interaction.c
+++ b/src/interaction.c
@@ -21,21 +21,16 @@ static char path[PATH_MAX];
 static void\r
 _popup_block_clicked_cb(void *data, Evas_Object *obj, void *event_info)\r
 {\r
-       //elm_popup_dismiss(obj);\r
-       evas_object_del(obj);\r
 }\r
 \r
 static void\r
 _popup_hide_cb(void *data, Evas_Object *obj, void *event_info)\r
 {\r
-       //elm_popup_dismiss(obj);\r
-       evas_object_del(obj);\r
 }\r
 \r
 static void\r
 _popup_hide_finished_cb(void *data, Evas_Object *obj, void *event_info)\r
 {\r
-       evas_object_del(obj);\r
 }\r
 \r
 static void\r
@@ -70,7 +65,8 @@ void recovery_failed_show_popup(Evas_Object *nf, int error)
        LOGI("Inside fota_show_result_popup");\r
        char title[PATH_MAX], text[PATH_MAX];\r
        Evas_Object *popup = elm_popup_add(nf);\r
-       elm_popup_align_set(popup, ELM_NOTIFY_ALIGN_FILL, 1.0);\r
+       elm_object_style_set(popup, "transparent");\r
+       elm_popup_align_set(popup, ELM_NOTIFY_ALIGN_FILL, 0.5);\r
        evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);\r
 \r
        snprintf(title, sizeof(title), "%s Failed",RECOVERY_TITLE);\r
@@ -123,21 +119,26 @@ _local_recovery_device_reboot_cb(void *data, Evas_Object *obj, void *event_info)
 {\r
        LOGI("Inside _local_recovery_device_reboot_cb");\r
        Evas_Object *nf = data;\r
+       Evas_Object *prev_popup = evas_object_data_get(obj, "recovery-popup");\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
+       elm_object_style_set(popup, "transparent");\r
+       elm_popup_align_set(popup, ELM_NOTIFY_ALIGN_FILL, 0.5);\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
+       if (prev_popup) {\r
+               evas_object_del(prev_popup);\r
+       }\r
+\r
        /* Reboot device to start recovery */\r
        int ret = device_power_reboot("recovery");\r
        LOGI("device_power_reboot API return : %d", ret);\r
@@ -155,7 +156,8 @@ void recovery_show_popup(Evas_Object *nf, char *title, char *image_path)
        snprintf(path, sizeof(path), "%s", image_path);\r
 \r
        Evas_Object *popup = elm_popup_add(nf);\r
-       elm_popup_align_set(popup, ELM_NOTIFY_ALIGN_FILL, 1.0);\r
+       elm_object_style_set(popup, "transparent");\r
+       elm_popup_align_set(popup, ELM_NOTIFY_ALIGN_FILL, 0.5);\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
        elm_object_text_set(popup,buf);\r
@@ -176,6 +178,7 @@ void recovery_show_popup(Evas_Object *nf, char *title, char *image_path)
        //elm_object_style_set(btn2, "popup");\r
        elm_object_text_set(btn2, "Recover");\r
        elm_object_part_content_set(popup, "button2", btn2);\r
+       evas_object_data_set(btn2, "recovery-popup", popup);\r
        evas_object_smart_callback_add(btn2, "clicked", _local_recovery_device_reboot_cb, nf);\r
 \r
        evas_object_show(popup);\r

diff --git a/src/local-recovery-ui.c b/src/local-recovery-ui.c
index 1b84b891692c7ff3f48754da6b7b5b3de2aad9d8..cf777b6682fd49f804c8afa23ae1df6025cc4699 100755 (executable)
--- a/src/local-recovery-ui.c
+++ b/src/local-recovery-ui.c
@@ -33,54 +33,36 @@ win_back_cb(void *data, Evas_Object *obj, void *event_info)
 static void
 create_base_gui(appdata_s *ad)
 {
-       ad->win = elm_win_util_standard_add(PACKAGE, PACKAGE);
-               elm_win_autodel_set(ad->win, EINA_TRUE);
-
-               if (elm_win_wm_rotation_supported_get(ad->win)) {
-                       int rots[4] = {0, 90, 180, 270};
-                       elm_win_wm_rotation_available_rotations_set(ad->win, (const int *)(&rots), 4);
-               }
-
-               evas_object_smart_callback_add(ad->win, "delete,request", win_delete_request_cb, NULL);
-               eext_object_event_callback_add(ad->win, EEXT_CALLBACK_BACK, win_back_cb, ad);
-
-               /* Conformant */
-               /* Create and initialize elm_conformant,
-                  which is mandatory for the base UI to have a proper size
-                  when an indicator or virtual keypad is visible
-               */
-               ad->conform = elm_conformant_add(ad->win);
-               elm_win_indicator_mode_set(ad->win, ELM_WIN_INDICATOR_HIDE);
-               evas_object_size_hint_weight_set(ad->conform, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-               elm_win_resize_object_add(ad->win, ad->conform);
-               evas_object_show(ad->conform);
-
-               /* Naviframe */
-               ad->nf = elm_naviframe_add(ad->conform);
-               evas_object_show(ad->nf);
-          // elm_naviframe_prev_btn_auto_pushed_set(ad->nf, EINA_TRUE);
-               elm_object_content_set(ad->conform, ad->nf);
-
-               Evas_Object *bg;
-               char buf[PATH_MAX];
-               char *res_path = app_get_resource_path();
-               snprintf(buf, sizeof(buf), "%simages/LocalRecovery_BG.png", res_path);
-               LOGI("Bg Image path : %s", buf);
-               if(res_path) free(res_path);
-
-               bg = elm_bg_add(ad->nf);
-               elm_bg_option_set(bg, ELM_BG_OPTION_CENTER);
-               elm_bg_file_set(bg, buf, NULL);
-               Elm_Object_Item *nf_it = elm_naviframe_item_push(ad->nf, NULL, NULL, NULL, bg, "tabbar/notitle");
-               //elm_naviframe_item_pop_cb_set(nf_it, naviframe_pop_cb, ad->nf);
-
-               Evas_Object * toolbar = elm_bg_add(ad->nf);
-               toolbar = elm_bg_add(ad->nf);
-               elm_bg_option_set(toolbar, ELM_BG_OPTION_STRETCH);
-               elm_bg_file_set(toolbar, buf, NULL);
-               elm_object_item_part_content_set(nf_it, "tabbar", toolbar);
-
-               evas_object_show(ad->win);
+       ad->win = elm_win_add(NULL, PACKAGE, ELM_WIN_BASIC);
+       elm_win_autodel_set(ad->win, EINA_TRUE);
+       elm_win_alpha_set(ad->win, EINA_TRUE);
+
+       if (elm_win_wm_rotation_supported_get(ad->win)) {
+               int rots[4] = {0, 90, 180, 270};
+               elm_win_wm_rotation_available_rotations_set(ad->win, (const int *)(&rots), 4);
+       }
+
+       evas_object_smart_callback_add(ad->win, "delete,request", win_delete_request_cb, NULL);
+       eext_object_event_callback_add(ad->win, EEXT_CALLBACK_BACK, win_back_cb, ad);
+
+       /* Conformant */
+       /* Create and initialize elm_conformant,
+          which is mandatory for the base UI to have a proper size
+          when an indicator or virtual keypad is visible
+       */
+       ad->conform = elm_conformant_add(ad->win);
+       elm_win_indicator_mode_set(ad->win, ELM_WIN_INDICATOR_HIDE);
+       evas_object_size_hint_weight_set(ad->conform, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+       elm_win_resize_object_add(ad->win, ad->conform);
+       evas_object_show(ad->conform);
+
+       /* Naviframe */
+       ad->nf = elm_naviframe_add(ad->conform);
+       evas_object_show(ad->nf);
+    // elm_naviframe_prev_btn_auto_pushed_set(ad->nf, EINA_TRUE);
+       elm_object_content_set(ad->conform, ad->nf);
+
+       evas_object_show(ad->win);
 }
 
 static bool

diff --git a/tizen-manifest.xml b/tizen-manifest.xml
index 1ba45edf072a50b96c1410089af4951bf7d1b81c..dcb9819d6ea73ef945ac5f94677338e8591d0c2f 100755 (executable)
--- a/tizen-manifest.xml
+++ b/tizen-manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
 <manifest xmlns="http://tizen.org/ns/packages" api-version="5.5" package="org.tizen.local-recovery-ui" version="1.0.0">\r
     <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
+    <ui-application appid="org.tizen.local-recovery-ui" exec="local-recovery-ui" launch_mode="single" multiple="false" nodisplay="false" taskmanage="false" type="capp">\r
         <label>local-recovery-ui</label>\r
         <metadata key="tizen-recovery-manager" value="client"/>\r
     </ui-application>\r