Merge "Add new properties to ProgressBar" into devel/master

diff --combined dali-toolkit/styles/1920x1080/dali-toolkit-default-theme.json
index 3ad99cd,187702c..88c1483
--- 1/dali-toolkit/styles/1920x1080/dali-toolkit-default-theme.json
--- 2/dali-toolkit/styles/1920x1080/dali-toolkit-default-theme.json
+++ b/dali-toolkit/styles/1920x1080/dali-toolkit-default-theme.json
@@@ -182,19 -182,52 +182,52 @@@
      },
      "ProgressBar":
      {
-       "progressValue": 0,
        "trackVisual":{
-         "url":"{DALI_IMAGE_DIR}progress-skin.9.png",
-         "size":[24,24]
+         "visualType":"IMAGE",
+         "url":"{DALI_IMAGE_DIR}progress-bar-skin-track.9.png"
        },
        "progressVisual":{
-         "url":"{DALI_IMAGE_DIR}progress-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":
      {
@@@ -237,10 -270,6 +270,10 @@@
           "url": "{DALI_IMAGE_DIR}button-disabled.9.png"
         }
      },
 +    "ToggleButton":
 +    {
 +      "styles":["Button"]
 +    },
      "CheckBoxButton":
      {
        "styles":["Button"],

diff --combined dali-toolkit/styles/480x800/dali-toolkit-default-theme.json
index f7b49db,a40c517..9c5f800
--- 1/dali-toolkit/styles/480x800/dali-toolkit-default-theme.json
--- 2/dali-toolkit/styles/480x800/dali-toolkit-default-theme.json
+++ b/dali-toolkit/styles/480x800/dali-toolkit-default-theme.json
@@@ -229,19 -229,52 +229,52 @@@
      },
      "ProgressBar":
      {
-       "progressValue": 0,
        "trackVisual":{
-         "url":"{DALI_IMAGE_DIR}progress-skin.9.png",
-         "size":[24,24]
+         "visualType":"IMAGE",
+         "url":"{DALI_IMAGE_DIR}progress-bar-skin-track.9.png"
        },
        "progressVisual":{
-         "url":"{DALI_IMAGE_DIR}progress-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":
      {
@@@ -284,10 -317,6 +317,10 @@@
           "url": "{DALI_IMAGE_DIR}button-disabled.9.png"
         }
      },
 +    "ToggleButton":
 +    {
 +      "styles":["Button"]
 +    },
      "CheckBoxButton":
      {
        "styles":["Button"],