fade.edc: changed programs, transition type and duration

Change-Id: I1754af581de35d75015cd37880a18e00696297cc
Signed-off-by: MinJeong Kim <minjjj.kim@samsung.com>

diff --git a/data/effect.edc b/data/effect.edc
index 97f2355..81ed67b 100644 (file)
--- a/data/effect.edc
+++ b/data/effect.edc
@@ -1,5 +1,5 @@
 #define COMP_EFFECT_DURATION 0.4
-#define COMP_EFFECT_DURATION_FAST 0.3
+#define COMP_EFFECT_DURATION_FAST 0.2
 
 collections {
 

diff --git a/data/group/fade.edc b/data/group/fade.edc
index 3ca7aa7..10b8b26 100644 (file)
--- a/data/group/fade.edc
+++ b/data/group/fade.edc
@@ -67,8 +67,8 @@ group { name: "e/comp/effects/fade";
         part { name: "shower";
         type: SPACER;
         description { state: "default" 0.0;
-           rel1.relative: 0.02 0.02;
-           rel2.relative: 0.98 0.98;
+           rel1.relative: 0.05 0.05;
+           rel2.relative: 0.95 0.95;
         }
         description { state: "visible" 0.0;
            inherit: "default" 0.0;
@@ -111,8 +111,16 @@ group { name: "e/comp/effects/fade";
         signal: "e,action,go";
         source: "e";
         filter: "shower" "default";
+        action: STATE_SET "default" 0.0;
+        transition: LINEAR 0.01;
+        target: "shower";
+        target: "clipper";
+        target: "e.swallow.content";
+        after: "show2";
+     }
+     program { name: "show2";
         action: STATE_SET "visible" 0.0;
-        transition: ACCELERATE COMP_EFFECT_DURATION_FAST;
+        transition: DECEL_FAC 0.10 0.8;
         target: "shower";
         target: "clipper";
         target: "e.swallow.content";
@@ -122,37 +130,58 @@ group { name: "e/comp/effects/fade";
         signal: "e,action,go";
         source: "e";
         filter: "shower" "visible";
-        action: STATE_SET "hide" 0.0;
-        transition: ACCELERATE COMP_EFFECT_DURATION_FAST;
+        action: STATE_SET "visible" 0.0;
+        transition: LINEAR 0.01;
         target: "shower";
         target: "clipper";
         after: "hide2";
      }
      program { name: "hide2";
+        action: STATE_SET "hide" 0.0;
+        transition: ACCEL_FAC 0.20 1.5;
+        target: "shower";
+        target: "clipper";
+        after: "hide3";
+     }
+     program { name: "hide3";
         action: STATE_SET "default" 0.0;
         target: "shower";
         target: "clipper";
         after: "done";
      }
-     program { name: "restack,hide";
+     program { name: "restack,show1";
         signal: "e,action,go";
         source: "e";
-        filter: "shower" "restack_visible";
-        action: STATE_SET "hide" 0.0;
-        transition: ACCELERATE COMP_EFFECT_DURATION_FAST;
+        filter: "shower" "restack_hidden";
+        action: STATE_SET "restack_hidden" 0.0;
+        transition: LINEAR 0.01;
         target: "shower";
         target: "clipper";
+        after: "restack,show2";
+     }
+     program { name: "restack,show2";
+        action: STATE_SET "visible" 0.0;
+        transition: DECEL_FAC 0.10 0.8;
+        target: "shower";
+        target: "clipper";
+        target: "e.swallow.content";
         after: "done";
      }
-     program { name: "restack,show";
+     program { name: "restack,hide1";
         signal: "e,action,go";
         source: "e";
-        filter: "shower" "restack_hidden";
-        action: STATE_SET "visible" 0.0;
-        transition: ACCELERATE COMP_EFFECT_DURATION_FAST;
+        filter: "shower" "restack_visible";
+        action: STATE_SET "restack_visible" 0.0;
+        transition: LINEAR 0.01;
+        target: "shower";
+        target: "clipper";
+        after: "restack,hide2";
+     }
+     program { name: "restack,hide2";
+        action: STATE_SET "hide" 0.0;
+        transition: ACCEL_FAC 0.20 1.5;
         target: "shower";
         target: "clipper";
-        target: "e.swallow.content";
         after: "done";
      }
      program { name: "restack,finish";