X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Fstyles%2F720x1280%2Fdali-toolkit-default-theme.json;h=d846c0f220700295337a17558d7811a2f510a9b4;hp=2f249339560d75ae8041a7442f3ffa74fc4cc811;hb=c57e053b5795783ad92b0fd7f8fbaba6b6d9322a;hpb=d748f6c99a59e045b8a8d267012372f996cbc3fd

diff --git a/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json b/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json
index 2f24933..d846c0f 100644
--- a/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json
+++ b/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 Samsung Electronics Co., Ltd.
  *
  * This file is part of Dali Toolkit
  *
@@ -124,6 +124,7 @@
     "TextSelectionToolbar":
     {
       "enableOvershoot":true,
+      "enableScrollBar":true,
       "scrollView":
       {
         "overshootAnimationSpeed":360.0,
@@ -142,6 +143,12 @@
       "overshootAnimationSpeed":360.0,
       "overshootSize":[720.0,130.0]
     },
+    "ScrollBar":
+    {
+      "indicatorShowDuration":0.25,
+      "indicatorHideDuration":0.25,
+      "color":[0.0,0.72,0.9,0.7]
+    },
     "TextEditor":
     {
       "pointSize":18,
@@ -203,19 +210,52 @@
     },
     "ProgressBar":
     {
-      "progressValue": 0,
       "trackVisual":{
-        "url":"{DALI_IMAGE_DIR}slider-skin.9.png",
-        "size":[24,24]
+        "visualType":"IMAGE",
+        "url":"{DALI_IMAGE_DIR}progress-bar-skin-track.9.png"
       },
       "progressVisual":{
-        "url":"{DALI_IMAGE_DIR}slider-skin-progress.9.png",
-        "size":[24,24]
-      }
-    },
-    "ProgressBarValueTextLabel":
-    {
-      "textColor":[0.8,0.8,1,1]
+        "visualType":"IMAGE",
+        "url":"{DALI_IMAGE_DIR}progress-bar-skin-progress.9.png"
+      },
+      "secondaryProgressVisual":{
+        "visualType":"IMAGE",
+        "url":"{DALI_IMAGE_DIR}progress-bar-skin-secondary-progress.9.png"
+      },
+      "indeterminateVisual":{
+        "visualType":"IMAGE",
+        "pixelArea":[0.0, 0.0, 10.0, 1.0],
+        "wrapModeU":"REPEAT",
+        "url":"{DALI_IMAGE_DIR}progress-bar-skin-indeterminate.png"
+      },
+      "indeterminateVisualAnimation":
+      [
+        {
+          "target":"indeterminateVisual",
+          "property":"pixelArea",
+          "initialValue":[0.0, 0.0, 10.0, 1.0],
+          "targetValue":[-1.0, 0.0, 10.0, 1.0],
+          "animator":
+          {
+            "alphaFunction":"DEFAULT",
+            "timePeriod":
+            {
+              "duration":0.8,
+              "delay":0
+            }
+          }
+        }
+      ],
+      "labelVisual":{
+        "visualType": "TEXT",
+        "textColor": [ 1.0, 1.0, 1.0, 1.0 ],
+        "pointSize" : 12.0, // Point size must always be provided to Text Visual
+        "horizontalAlignment": "CENTER",
+        "verticalAlignment": "CENTER"
+      },
+      "progressValue": 0.0,
+      "secondaryProgressValue":0.0,
+      "indeterminate": false
     },
     "Button":
     {
@@ -233,7 +273,7 @@
        {
          "visualType": "TEXT",
          "horizontalAlignment": "CENTER",
-         "pointSize" : 12.0, // Point size must always be provided to Text Visual
+         "pointSize" : 10.0, // Point size must always be provided to Text Visual
          "verticalAlignment": "CENTER"
        },
       "unselectedBackgroundVisual":
@@ -264,7 +304,7 @@
       "label":
        {
          "visualType": "TEXT",
-         "pointSize" : 12.0, // Point size must always be provided to Text Visual
+         "pointSize" : 10.0, // Point size must always be provided to Text Visual
          "verticalAlignment": "CENTER"
        },
       "unselectedVisual":
@@ -295,7 +335,7 @@
       "label":
        {
          "visualType": "TEXT",
-         "pointSize" : 12.0, // Point size must always be provided to Text Visual
+         "pointSize" : 10.0, // Point size must always be provided to Text Visual
          "verticalAlignment": "CENTER"
        },
       "unselectedVisual":