[dali_1.0.43] Merge branch 'tizen'

[platform/core/uifw/dali-demo.git] / resources / scripts / animation.json

diff --git a/resources/scripts/animation.json b/resources/scripts/animation.json
index 0bbe545..0383037 100644 (file)
--- a/resources/scripts/animation.json
+++ b/resources/scripts/animation.json
@@ -59,7 +59,7 @@
       "duration": 10.0,
       "properties": [{
         "actor": "image", // referenced actors must exist on stage
-        "property": "rotation",
+        "property": "orientation",
         "value": [0, 0, -45],
         "alpha-function": "EASE_IN_OUT",
         "time-period": {
@@ -85,12 +85,12 @@
   // a tree of actors
   "stage": [{
     "name": "greeting",
-    "type": "TextView",
+    "type": "TextLabel",
     "text": "Touch me",
     "styles": ["basic-text"],
     "position": [0, -120, 0],
     "size": [200, 200, 1],
-    "rotation": [0, 0, 30],
+    "orientation": [0, 0, 30],
     "signals": [{
       "name": "touched",
       "action": "play",
@@ -98,11 +98,11 @@
     }]
   }, {
     "name":"greeting2",
-    "type": "TextView",
+    "type": "TextLabel",
     "parent-origin": "CENTER",
     "anchor-point": "CENTER",
     "size": [200, 200, 1],
-    "rotation": [0, 0, 39],
+    "orientation": [0, 0, 39],
     "position": [-150, -50, 0],
     "text": "or me",
     "signals": [{
@@ -111,7 +111,7 @@
       "animation": "path-animation"
     }]
   }, {
-    "type": "TextView", // styles can be additive
+    "type": "TextLabel", // styles can be additive
     "parent-origin": "CENTER",
     "anchor-point": "CENTER",
     "size": [200, 200, 1],
@@ -122,6 +122,7 @@
     "image": {
       "filename": "{DALI_IMAGE_DIR}gallery-large-21.jpg"
     },
+    "relayout-enabled": false,
     "position": [0, 200, 0],
     "size": [200, 200, 1],
     "signals": [{