Revert "Change window level for blocking the sudden appearence of the other app"

This reverts commit 70c2dbf0905940cb9d52d08a301c4d530ad2ebea.

Change-Id: I9ae06470a5da6d6d8cbc04f88148c85661a0de3f

diff --git a/src/animation.c b/src/animation.c
index a0074e9e5d9e786c74db8b695d00c2b91e06cfe7..8de3bbae258769202fda95712120e26bc43488ff 100644 (file)
--- a/src/animation.c
+++ b/src/animation.c
@@ -73,15 +73,6 @@ static void __block_display(void)
        s_animation.display_block = display_block;
 }
 
-static void __visibility_changed_cb(void *data, Evas_Object *obj, void *event)
-{
-       __D("Visibility changed");
-       int visibility = (int)(void *)event;
-
-       if (!visibility)
-               boot_exit();
-}
-
 static Eina_Bool __end_cb(void *data)
 {
        int type = (int) data;
@@ -101,6 +92,8 @@ static Eina_Bool __end_cb(void *data)
                __block_display();
        } else {
                __D("EXIT on BOOTING");
+               if (vconf_set_int(VCONFKEY_BOOT_ANIMATION_FINISHED, 1) != 0)
+                       __E("Failed to set finished set");
                boot_exit();
        }
        return ECORE_CALLBACK_CANCEL;
@@ -110,15 +103,13 @@ static void __animation_finished_cb(void *d, Evas_Object * obj, const char *e, c
 {
        if (s_animation.state == TYPE_OFF) {
                __D("TYPE OFF");
+               if (vconf_set_int(VCONFKEY_BOOT_ANIMATION_FINISHED, 1) != 0)
+                       __E("Failed to set finished set");
                ecore_timer_add(1, __end_cb, (void *)TYPE_OFF);
        } else {
                __D("TYPE_ON");
-               efl_util_set_notification_window_level(s_animation.win, EFL_UTIL_NOTIFICATION_LEVEL_NONE);
-               ecore_timer_add(10, __end_cb, (void *)TYPE_ON);
+               __end_cb((void *)TYPE_ON);
        }
-
-       if (vconf_set_int(VCONFKEY_BOOT_ANIMATION_FINISHED, 1) != 0)
-               __E("Failed to set finished set");
 }
 
 static void __fini_layout(void)
@@ -150,10 +141,9 @@ Evas_Object *create_window(void)
                __E("Failed to create a new window");
                return NULL;
        }
+       elm_win_aux_hint_add(win, "wm.comp.win.always.selective.mode", "1");
        elm_win_role_set(win, "alert");
-       efl_util_set_notification_window_level(win, EFL_UTIL_NOTIFICATION_LEVEL_TOP);
-       evas_object_smart_callback_add(s_animation.win, "visibility,changed", __visibility_changed_cb, NULL);
-       elm_win_aux_hint_add(win, "wm.comp.win.always.selective.mode", "0");
+       efl_util_set_notification_window_level(win, EFL_UTIL_NOTIFICATION_LEVEL_HIGH);
        evas_object_smart_callback_add(win, "delete-request", win_del, NULL);
 
        elm_win_screen_size_get(win, NULL, NULL, &s_animation.w, &s_animation.h);