Merge remote-tracking branch 'origin/tizen' into devel/new_mesh

Conflicts:
	examples/animated-shapes/animated-shapes-example.cpp
	examples/bubble-effect/bubble-effect-example.cpp
	examples/new-window/new-window-example.cpp
	examples/path-animation/path-animation.cpp

Change-Id: I0e3fe040dfe9faaf9074617294d1fde7f0b7ef67

diff --cc demo/dali-table-view.cpp
Simple merge

diff --cc examples/bubble-effect/bubble-effect-example.cpp
index 15b7ba1,5e4e304..0ac4d76
--- 1/examples/bubble-effect/bubble-effect-example.cpp
--- 2/examples/bubble-effect/bubble-effect-example.cpp
+++ b/examples/bubble-effect/bubble-effect-example.cpp
@@@ -287,15 -280,19 +283,15 @@@ private
  
    Application&               mApp;
    Image                      mBackgroundImage;
-   ImageActor                 mBackgroundActor;
+   Dali::Toolkit::Control     mBackground;
  
    Toolkit::BubbleEmitter     mBubbleEmitter;
 -  Vector3                    mHSVDelta;
 -
    Animation                  mEmitAnimation;
 -  unsigned int               mAnimateComponentCount;
 -  bool                       mNeedNewAnimation;
 -
 +  Toolkit::PushButton        mChangeBackgroundButton;
 +  Toolkit::PushButton        mChangeBubbleShapeButton;
    Timer                      mTimerForBubbleEmission;
 -  unsigned int               mNonMovementCount;
 -  unsigned int               mTimerInterval;
  
 +  Vector3                    mHSVDelta;
    Vector2                    mCurrentTouchPosition;
    Vector2                    mEmitPosition;
  

diff --cc examples/cluster/cluster-example.cpp
Simple merge

diff --cc examples/dissolve-effect/dissolve-effect-example.cpp
Simple merge

diff --cc examples/motion-blur/motion-blur-example.cpp
Simple merge

diff --cc examples/motion-stretch/motion-stretch-example.cpp
Simple merge

diff --cc examples/new-window/new-window-example.cpp
index 7e854b0,9282c8c..7ea4753
--- 1/examples/new-window/new-window-example.cpp
--- 2/examples/new-window/new-window-example.cpp
+++ b/examples/new-window/new-window-example.cpp
@@@ -15,6 -15,13 +15,8 @@@
   */
  
  #include <dali-toolkit/dali-toolkit.h>
 -#include <dali/devel-api/actors/mesh-actor.h>
 -#include <dali/devel-api/modeling/material.h>
 -#include <dali/devel-api/geometry/mesh.h>
+ #include <dali-toolkit/devel-api/controls/bubble-effect/bubble-emitter.h>
 -#include <dali-toolkit/devel-api/shader-effects/bubble-effect/color-adjuster.h>
 -
+ 
  #include "shared/view.h"
  #include <cstdio>
  #include <iostream>
@@@ -538,9 -459,10 +538,9 @@@ void RunTest(Application& app
  
  // Entry point for Linux & Tizen applications
  //
 -
  int main(int argc, char **argv)
  {
-   gApplication = Application::New(&argc, &argv);
+   gApplication = Application::New(&argc, &argv, DALI_DEMO_THEME_PATH);
    RunTest(gApplication);
  
    return 0;

diff --cc examples/page-turn-view/page-turn-view-example.cpp
index 3596034,39e329e..79b6ac2
--- 1/examples/page-turn-view/page-turn-view-example.cpp
--- 2/examples/page-turn-view/page-turn-view-example.cpp
+++ b/examples/page-turn-view/page-turn-view-example.cpp
@@@ -17,6 -17,12 +17,11 @@@
  
  #include <dali/dali.h>
  #include <dali-toolkit/dali-toolkit.h>
 -#include <dali-toolkit/devel-api/shader-effects/page-turn-effect.h>
+ #include <dali-toolkit/devel-api/controls/page-turn-view/page-factory.h>
+ #include <dali-toolkit/devel-api/controls/page-turn-view/page-turn-landscape-view.h>
+ #include <dali-toolkit/devel-api/controls/page-turn-view/page-turn-portrait-view.h>
+ #include <dali-toolkit/devel-api/controls/page-turn-view/page-turn-view.h>
+ 
  #include <assert.h>
  #include <cstdlib>
  #include <string.h>

diff --cc examples/radial-menu/radial-menu-example.cpp
Simple merge

diff --cc examples/refraction-effect/refraction-effect-example.cpp
index 8626c38,a220490..e98f0e1
--- 1/examples/refraction-effect/refraction-effect-example.cpp
--- 2/examples/refraction-effect/refraction-effect-example.cpp
+++ b/examples/refraction-effect/refraction-effect-example.cpp
@@@ -233,10 -320,8 +233,8 @@@ private
    // The Init signal is received once (only) during the Application lifetime
    void Create(Application& application)
    {
-     DemoHelper::RequestThemeChange();
- 
      Stage stage = Stage::GetCurrent();
 -    mStageHalfSize = stage.GetSize() * 0.5f;
 +    Vector2 stageSize = stage.GetSize();
  
      stage.KeyEventSignal().Connect(this, &RefractionEffectExample::OnKeyEvent);