Merge remote-tracking branch 'origin/tizen' into new_text

Conflicts: demo/dali-demo.cpp demo/dali-table-view.cpp examples/builder/examples.cpp examples/buttons/buttons-example.cpp examples/item-view/item-view-example.cpp examples/path-animation/path-animation.cpp examples/text-view/text-view-example.cpp shared/view.h Change-Id: I152b06854b349f0430172227f1d79ee16855fbc0

Merge remote-tracking branch 'origin/tizen' into new_text
Conflicts: demo/dali-demo.cpp demo/dali-table-view.cpp examples/builder/examples.cpp examples/buttons/buttons-example.cpp examples/item-view/item-view-example.cpp examples/path-animation/path-animation.cpp examples/text-view/text-view-example.cpp shared/view.h Change-Id: I152b06854b349f0430172227f1d79ee16855fbc0
Paul Wisbey
2 parents 328d390c 1d5b074a
Showing 49 changed files with 2073 additions and 1688 deletions
com.samsung.dali-demo.xml
demo/dali-demo.cpp
demo/dali-table-view.cpp
demo/dali-table-view.h
examples/animated-shapes/animated-shapes-example.cpp
examples/blocks/blocks-example.cpp
examples/builder/examples.cpp
examples/buttons/buttons-example.cpp
examples/cluster/cluster-example.cpp
examples/cube-transition-effect/cube-transition-effect-example.cpp
examples/hello-world/hello-world-example.cpp
examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp
examples/item-view/item-view-example.cpp
examples/logging/logging-example.cpp
examples/magnifier/magnifier-example.cpp
examples/page-turn-view/page-turn-view-example.cpp
examples/path-animation/path-animation.cpp
examples/scripting/launcher.cpp
examples/scripting/launcher.h
examples/text-field/edit-layout.cpp → examples/scripting/scripting-example.cpp
@@ -52,6 +52,9 @@
 	<ui-application appid="refraction-effect.example" exec="/usr/apps/com.samsung.dali-demo/bin/refraction-effect.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
 		<label>Refraction effect</label>
 	</ui-application>
+	<ui-application appid="scripting.example" exec="/usr/apps/com.samsung.dali-demo/bin/scripting.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
+    <label>Scroll View</label>
+  </ui-application>
 	<ui-application appid="scroll-view.example" exec="/usr/apps/com.samsung.dali-demo/bin/scroll-view.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
 		<label>Scroll View</label>
 	</ui-application>
@@ -68,7 +71,7 @@
 		<label>Image Scaling Modes</label>
 	</ui-application>
 	<ui-application appid="buttons.example" exec="/usr/apps/com.samsung.dali-demo/bin/buttons.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
-		<label>Radio Buttons</label>
+		<label>Buttons</label>
 	</ui-application>
 	<ui-application appid="text-label.example" exec="/usr/apps/com.samsung.dali-demo/bin/text-label.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
 		<label>Text Label</label>
@@ -94,4 +97,7 @@
 	<ui-application appid="atlas.example" exec="/usr/apps/com.samsung.dali-demo/bin/atlas.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
 		<label>Atlas</label>
 	</ui-application>
+	<ui-application appid="size-negotiation.example" exec="/usr/apps/com.samsung.dali-demo/bin/size-negotiation.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
+		<label>Size Negotiation</label>
+	</ui-application>
 </manifest>
@@ -50,13 +50,16 @@ int main(int argc, char **argv)
   demo.AddExample(Example("refraction-effect.example", DALI_DEMO_STR_TITLE_REFRACTION));
   demo.AddExample(Example("scroll-view.example", DALI_DEMO_STR_TITLE_SCROLL_VIEW));
   demo.AddExample(Example("shadow-bone-lighting.example", DALI_DEMO_STR_TITLE_LIGHTS_AND_SHADOWS));
-  demo.AddExample(Example("builder.example", DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI));
+//  demo.AddExample(Example("builder.example", DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI));
   demo.AddExample(Example("image-scaling-irregular-grid.example", DALI_DEMO_STR_TITLE_IMAGE_SCALING));
   demo.AddExample(Example("text-label.example", DALI_DEMO_STR_TITLE_TEXT_LABEL));
   demo.AddExample(Example("text-label-multi-language.example", DALI_DEMO_STR_TITLE_TEXT_LABEL_MULTI_LANGUAGE));
   demo.AddExample(Example("text-label-emojis.example", DALI_DEMO_STR_TITLE_EMOJI_TEXT));
   demo.AddExample(Example("animated-shapes.example", DALI_DEMO_STR_TITLE_ANIMATED_SHAPES));
   demo.AddExample(Example("path-animation.example", DALI_DEMO_STR_TITLE_PATH_ANIMATION));
+  demo.AddExample(Example("size-negotiation.example", "Size Negotiation"));
+
+  demo.SortAlphabetically( true );
   // Start the event loop
   app.MainLoop();
@@ -56,10 +56,10 @@ const int MAX_PAGES = 256;                                      ///&lt; Maximum pag
 const int EXAMPLES_PER_ROW = 3;
 const int ROWS_PER_PAGE = 3;
 const int EXAMPLES_PER_PAGE = EXAMPLES_PER_ROW * ROWS_PER_PAGE;
-const float LOGO_MARGIN_RATIO = 0.5f / 0.9f;
+const float LOGO_MARGIN_RATIO = 0.1f / 0.3f;
 const float BOTTOM_PADDING_RATIO = 0.4f / 0.9f;
 const Vector3 SCROLLVIEW_RELATIVE_SIZE(0.9f, 1.0f, 0.8f );     ///< ScrollView's relative size to its parent
-const Vector3 TABLE_RELATIVE_SIZE(0.9f, 0.9f, 0.8f );          ///< TableView's relative size to the entire stage. The Y value means sum of the logo and table relative heights.
+const Vector3 TABLE_RELATIVE_SIZE(0.95f, 0.9f, 0.8f );          ///< TableView's relative size to the entire stage. The Y value means sum of the logo and table relative heights.
 const float STENCIL_RELATIVE_SIZE = 1.0f;
 const float EFFECT_SNAP_DURATION = 0.66f;                       ///< Scroll Snap Duration for Effects
@@ -76,7 +76,6 @@ const float SCALE_SPEED_SIN = 0.1f;
 const unsigned int BACKGROUND_ANIMATION_DURATION = 15000; // 15 secs
 const float BACKGROUND_Z = -1.0f;
-const float BACKGROUND_SIZE_SCALE = 1.0f;
 const Vector4 BACKGROUND_COLOR( 1.0f, 1.0f, 1.0f, 1.0f );
 const float BUBBLE_MIN_Z = -1.0;
@@ -104,10 +103,11 @@ ImageActor CreateBackground( std::string imagePath )
 {
   Image image = ResourceImage::New( imagePath );
   ImageActor background = ImageActor::New( image );
-
+  background.SetName( "BACKGROUND" );
   background.SetAnchorPoint( AnchorPoint::CENTER );
   background.SetParentOrigin( ParentOrigin::CENTER );
   background.SetZ( -1.0f );
+  background.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
   return background;
 }
@@ -119,7 +119,7 @@ const float IMAGE_BORDER_TOP = IMAGE_BORDER_LEFT;
 const float IMAGE_BORDER_BOTTOM = IMAGE_BORDER_LEFT;
 /**
- * Constraint to return a position for a bubble based on the scroll value and vertical wrapping.
+ * Constraint to return a position for a bubble based on the scroll value and vertical wrapping
  */
 struct AnimateBubbleConstraint
 {
@@ -134,15 +134,15 @@ public:
   Vector3 operator()( const Vector3& current, const PropertyInput& scrollProperty, const PropertyInput& parentSize )
   {
     Vector3 pos( current );
+    const float parentHeight = parentSize.GetVector3().height;
-    // Wrap bubbles verically.
-    if( pos.y + mShapeSize * 0.5f < -parentSize.GetVector3().y * 0.5f )
+    // Wrap bubbles vertically
+    if( pos.y + mShapeSize * 0.5f < -parentHeight * 0.5f )
     {
-      pos.y += parentSize.GetVector3().y + mShapeSize;
+      pos.y = parentHeight * 0.5f + mShapeSize * 0.5f;
     }
-    // Bubbles X position moves parallax to horizontal
-    // panning by a scale factor unique to each bubble.
+    // Bubbles X position moves parallax to horizontal panning by a scale factor unique to each bubble
     pos.x = mInitialX + ( scrollProperty.GetVector3().x * mScale );
     return pos;
   }
@@ -166,7 +166,6 @@ DaliTableView::DaliTableView( Application&amp; application )
   mRootActor(),
   mRotateAnimation(),
   mBackground(),
-  mLogo(),
   mPressedAnimation(),
   mScrollViewLayer(),
   mScrollView(),
@@ -226,15 +225,14 @@ void DaliTableView::Initialize( Application&amp; application )
   const Vector2 stageSize = Stage::GetCurrent().GetSize();
   // Background
-  mBackground = CreateBackground( mBackgroundImagePath );
-  // set same size as parent actor
-  mBackground.SetSize( stageSize );
-  Stage::GetCurrent().Add( mBackground );
+  Actor background = CreateBackground( mBackgroundImagePath );
+  Stage::GetCurrent().Add( background );
   // Render entire content as overlays, as is all on same 2D plane.
   mRootActor = TableView::New( 4, 1 );
   mRootActor.SetAnchorPoint( AnchorPoint::CENTER );
   mRootActor.SetParentOrigin( ParentOrigin::CENTER );
+  mRootActor.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
   Stage::GetCurrent().Add( mRootActor );
   // Toolbar at top
@@ -245,37 +243,42 @@ void DaliTableView::Initialize( Application&amp; application )
                                                        DemoHelper::DEFAULT_VIEW_STYLE);
   mRootActor.AddChild( toolBarLayer, TableView::CellPosition( 0, 0 ) );
-  const float toolbarHeight = DemoHelper::DEFAULT_VIEW_STYLE.mToolBarHeight;
-  mRootActor.SetFixedHeight( 0, toolbarHeight );
+  mRootActor.SetFitHeight( 0 );
   // Add logo
-  mLogo = CreateLogo( LOGO_PATH );
+  Dali::ImageActor logo = CreateLogo( LOGO_PATH );
+  logo.SetName( "LOGO_IMAGE" );
+  logo.SetResizePolicy( USE_NATURAL_SIZE, ALL_DIMENSIONS );
   const float paddingHeight = ( ( 1.f-TABLE_RELATIVE_SIZE.y ) * stageSize.y );
   const float logoMargin = paddingHeight * LOGO_MARGIN_RATIO;
-  const float logoHeight = mLogo.GetImage().GetHeight() + logoMargin;
-  mRootActor.SetFixedHeight( 1, logoHeight );
   // Show version in a popup when log is tapped
   mLogoTapDetector = TapGestureDetector::New();
-  mLogoTapDetector.Attach( mLogo );
+  mLogoTapDetector.Attach( logo );
   mLogoTapDetector.DetectedSignal().Connect( this, &DaliTableView::OnLogoTapped );
   const float bottomMargin = paddingHeight * BOTTOM_PADDING_RATIO;
-  mButtonsPageRelativeSize = Vector3( TABLE_RELATIVE_SIZE.x, 1.f - ( toolbarHeight + logoHeight + bottomMargin) / stageSize.height, TABLE_RELATIVE_SIZE.z );
-  mRootActor.SetFixedHeight( 2, mButtonsPageRelativeSize.y * stageSize.height );
   Alignment alignment = Alignment::New();
-  alignment.Add(mLogo);
+  alignment.SetName( "LOGO_ALIGNMENT" );
+  alignment.Add( logo );
+  alignment.SetResizePolicy( FILL_TO_PARENT, WIDTH );
+  alignment.SetResizePolicy( FIT_TO_CHILDREN, HEIGHT );
+  Actor alignmentActor = alignment;
+  alignmentActor.SetPadding( Padding( 0.0f, 0.0f, logoMargin, logoMargin ));
   mRootActor.AddChild( alignment, TableView::CellPosition( 1, 0 ) );
+  mRootActor.SetFitHeight( 1 );
   // scrollview occupying the majority of the screen
   mScrollView = ScrollView::New();
+  mScrollView.SetRelayoutEnabled( true );
   mScrollView.SetAnchorPoint( AnchorPoint::CENTER );
   mScrollView.SetParentOrigin( ParentOrigin::CENTER );
-  // Note: Currently, changing mScrollView to use SizeMode RELATIVE_TO_PARENT
-  // will cause scroll ends to appear in the wrong position.
-  mScrollView.ApplyConstraint( Dali::Constraint::New<Dali::Vector3>( Dali::Actor::Property::SIZE, Dali::ParentSource( Dali::Actor::Property::SIZE ), Dali::RelativeToConstraint( SCROLLVIEW_RELATIVE_SIZE ) ) );
+  mScrollView.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
+  const float buttonsPageMargin = ( 1.0f - TABLE_RELATIVE_SIZE.x ) * 0.5f * stageSize.width;
+  mScrollView.SetPadding( Padding( buttonsPageMargin, buttonsPageMargin, 0.0f, 0.0f ) );
+
   mScrollView.SetAxisAutoLock( true );
   mScrollView.ScrollCompletedSignal().Connect( this, &DaliTableView::OnScrollComplete );
   mScrollView.ScrollStartedSignal().Connect( this, &DaliTableView::OnScrollStart );
@@ -285,12 +288,37 @@ void DaliTableView::Initialize( Application&amp; application )
   mScrollViewLayer.SetAnchorPoint( AnchorPoint::CENTER );
   mScrollViewLayer.SetParentOrigin( ParentOrigin::CENTER );
   mScrollViewLayer.SetDrawMode( DrawMode::OVERLAY );
+  mScrollViewLayer.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
+
+  // Create solid background colour.
+  ImageActor backgroundColourActor = Dali::Toolkit::CreateSolidColorActor( BACKGROUND_COLOR );
+  backgroundColourActor.SetAnchorPoint( AnchorPoint::CENTER );
+  backgroundColourActor.SetParentOrigin( ParentOrigin::CENTER );
+  backgroundColourActor.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
+  backgroundColourActor.SetSizeMode( SIZE_RELATIVE_TO_PARENT );
+  backgroundColourActor.SetSizeModeFactor( Vector3( 1.0f, 1.5f, 1.0f ) );
+  backgroundColourActor.SetZ( BACKGROUND_Z );
+  mScrollViewLayer.Add( backgroundColourActor );
   // Populate background and bubbles - needs to be scrollViewLayer so scroll ends show
-  SetupBackground( mScrollView, mScrollViewLayer, stageSize );
+  Actor bubbleContainer = Actor::New();
+  bubbleContainer.SetRelayoutEnabled( true );
+  bubbleContainer.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
+  bubbleContainer.SetAnchorPoint( AnchorPoint::CENTER );
+  bubbleContainer.SetParentOrigin( ParentOrigin::CENTER );
+  mScrollViewLayer.Add( bubbleContainer );
+
+  SetupBackground( bubbleContainer );
+
+  Alignment buttonsAlignment = Alignment::New();
+  buttonsAlignment.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
+  buttonsAlignment.Add( mScrollViewLayer );
   mScrollViewLayer.Add( mScrollView );
-  mRootActor.AddChild( mScrollViewLayer, TableView::CellPosition( 2, 0 ) );
+
+  mRootActor.AddChild( buttonsAlignment, TableView::CellPosition( 2, 0 ) );
+
+  mRootActor.SetFixedHeight( 3, bottomMargin );
   // Add scroll view effect and setup constraints on pages
   ApplyScrollViewEffect();
@@ -316,7 +344,7 @@ void DaliTableView::Initialize( Application&amp; application )
   winHandle.ShowIndicator( Dali::Window::INVISIBLE );
-  //
+  // Background animation
   mAnimationTimer = Timer::New( BACKGROUND_ANIMATION_DURATION );
   mAnimationTimer.TickSignal().Connect( this, &DaliTableView::PauseBackgroundAnimation );
   mAnimationTimer.Start();
@@ -332,12 +360,10 @@ void DaliTableView::ApplyCubeEffectToActors()
   {
     Actor page = *pageIter;
-    unsigned int numChildren = page.GetChildCount();
-    Actor pageActor = page;
-    for( unsigned int i=0; i<numChildren; ++i)
+    for( unsigned int i = 0, numChildren = page.GetChildCount(); i < numChildren; ++i)
     {
       // Remove old effect's manual constraints.
-      Actor child = pageActor.GetChildAt(i);
+      Actor child = page.GetChildAt(i);
       if( child )
       {
         ApplyCubeEffectToActor( child );
@@ -345,6 +371,12 @@ void DaliTableView::ApplyCubeEffectToActors()
     }
   }
 }
+
+void DaliTableView::OnButtonsPageRelayout( const Dali::Actor& actor )
+{
+
+}
+
 void DaliTableView::Populate()
 {
   const Vector2 stageSize = Stage::GetCurrent().GetSize();
@@ -365,20 +397,15 @@ void DaliTableView::Populate()
     for( int t = 0; t < mTotalPages; t++ )
     {
       // Create Table. (contains up to 9 Examples)
-      Actor page = Actor::New();
-
-      // Add tableView to container.
-      mScrollView.Add( page );
-
+      TableView page = TableView::New( 3, 3 );
       page.SetAnchorPoint( AnchorPoint::CENTER );
       page.SetParentOrigin( ParentOrigin::CENTER );
-      page.SetSizeMode( SIZE_EQUAL_TO_PARENT );
-
-      // add cells to table
-      const float margin = 4.0f;
+      page.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
+      mScrollView.Add( page );
       // Calculate the number of images going across (columns) within a page, according to the screen resolution and dpi.
-      const Size tileSize((stageSize.x * mButtonsPageRelativeSize.x / EXAMPLES_PER_ROW) - margin, (stageSize.y * mButtonsPageRelativeSize.y / ROWS_PER_PAGE) - margin );
+      const float margin = 2.0f;
+      const float tileParentMultiplier = 1.0f / EXAMPLES_PER_ROW;
       for(int row = 0; row < ROWS_PER_PAGE; row++)
       {
@@ -386,7 +413,7 @@ void DaliTableView::Populate()
         {
           const Example& example = ( *iter );
-          Actor tile = CreateTile( example.name, example.title, tileSize, true );
+          Actor tile = CreateTile( example.name, example.title, Vector3( tileParentMultiplier, tileParentMultiplier, 1.0f ), true );
           FocusManager focusManager = FocusManager::Get();
           focusManager.SetFocusOrder( tile, ++exampleCount );
           focusManager.SetAccessibilityAttribute( tile, Dali::Toolkit::FocusManager::ACCESSIBILITY_LABEL,
@@ -395,12 +422,9 @@ void DaliTableView::Populate()
           focusManager.SetAccessibilityAttribute( tile, Dali::Toolkit::FocusManager::ACCESSIBILITY_HINT,
                                                   "You can run this example" );
-          Vector3 position( margin * 0.5f + (tileSize.x + margin) * column - stageSize.width * mButtonsPageRelativeSize.x * 0.5f,
-                           margin * 0.5f + (tileSize.y + margin) * row - stageSize.height * mButtonsPageRelativeSize.y * 0.5f,
-                            0.0f);
-          tile.SetPosition( position + Vector3( tileSize.x, tileSize.y, 0.0f ) * 0.5f );
-          tile.SetSize( tileSize );
-          page.Add( tile );
+          tile.SetPadding( Padding( margin, margin, margin, margin ) );
+
+          page.AddChild( tile, TableView::CellPosition( row, column ) );
           iter++;
@@ -417,7 +441,7 @@ void DaliTableView::Populate()
       }
       // Set tableview position
-      Vector3 pagePos( stageSize.x * mButtonsPageRelativeSize.x * t, 0.0f, 0.0f );
+      Vector3 pagePos( stageSize.width * TABLE_RELATIVE_SIZE.x * t, 0.0f, 0.0f );
       page.SetPosition( pagePos );
       mPages.push_back( page );
@@ -430,9 +454,9 @@ void DaliTableView::Populate()
   }
   // Update Ruler info.
-  mScrollRulerX = new FixedRuler( stageSize.width * mButtonsPageRelativeSize.x );
+  mScrollRulerX = new FixedRuler( stageSize.width * TABLE_RELATIVE_SIZE.x );
   mScrollRulerY = new DefaultRuler();
-  mScrollRulerX->SetDomain( RulerDomain( 0.0f, mTotalPages * stageSize.width * mButtonsPageRelativeSize.x, true ) );
+  mScrollRulerX->SetDomain( RulerDomain( 0.0f, mTotalPages * stageSize.width * TABLE_RELATIVE_SIZE.x, true ) );
   mScrollRulerY->Disable();
   mScrollView.SetRulerX( mScrollRulerX );
   mScrollView.SetRulerY( mScrollRulerY );
@@ -466,12 +490,16 @@ void DaliTableView::Rotate( unsigned int degrees )
   mRotateAnimation.Play();
 }
-Actor DaliTableView::CreateTile( const std::string& name, const std::string& title, const Size& parentSize, bool addBackground )
+Actor DaliTableView::CreateTile( const std::string& name, const std::string& title, const Dali::Vector3& sizeMultiplier, bool addBackground )
 {
-  Actor tile = Actor::New();
-  tile.SetName( name );
-  tile.SetAnchorPoint( AnchorPoint::CENTER );
-  tile.SetParentOrigin( ParentOrigin::CENTER );
+  Actor content = Actor::New();
+  content.SetName( name );
+  content.SetAnchorPoint( AnchorPoint::CENTER );
+  content.SetParentOrigin( ParentOrigin::CENTER );
+  content.SetRelayoutEnabled( true );
+  content.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
+  content.SetSizeMode( SIZE_RELATIVE_TO_PARENT );
+  content.SetSizeModeFactor( sizeMultiplier );
   // create background image
   if( addBackground )
@@ -481,38 +509,38 @@ Actor DaliTableView::CreateTile( const std::string&amp; name, const std::string&amp; tit
     image.SetAnchorPoint( AnchorPoint::CENTER );
     image.SetParentOrigin( ParentOrigin::CENTER );
     // make the image 100% of tile
-    image.SetSizeMode( SIZE_EQUAL_TO_PARENT );
+    image.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
+
     // move image back to get text appear in front
     image.SetZ( -1 );
     image.SetStyle( ImageActor::STYLE_NINE_PATCH );
     image.SetNinePatchBorder( Vector4( IMAGE_BORDER_LEFT, IMAGE_BORDER_TOP, IMAGE_BORDER_RIGHT, IMAGE_BORDER_BOTTOM ) );
-    tile.Add( image );
+    content.Add( image );
     // Add stencil
     ImageActor stencil = NewStencilImage();
-    stencil.SetSizeMode( SIZE_EQUAL_TO_PARENT );
+    stencil.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
     image.Add( stencil );
   }
   TextLabel label = TextLabel::New();
   label.SetAnchorPoint( AnchorPoint::TOP_LEFT );
-  label.SetSize( parentSize );
   label.SetProperty( Control::Property::STYLE_NAME, "launcherlabel" );
   label.SetProperty( TextLabel::Property::MULTI_LINE, true );
   label.SetProperty( TextLabel::Property::TEXT, title );
   label.SetProperty( TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" );
   label.SetProperty( TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" );
   label.SetColor( TABLE_TEXT_STYLE_COLOR );
-  tile.Add( label );
+  content.Add( label );
   // Set the tile to be keyboard focusable
-  tile.SetKeyboardFocusable(true);
+  content.SetKeyboardFocusable(true);
   // connect to the touch events
-  tile.TouchedSignal().Connect( this, &DaliTableView::OnTilePressed );
-  tile.HoveredSignal().Connect( this, &DaliTableView::OnTileHovered );
+  content.TouchedSignal().Connect( this, &DaliTableView::OnTilePressed );
+  content.HoveredSignal().Connect( this, &DaliTableView::OnTileHovered );
-  return tile;
+  return content;
 }
 ImageActor DaliTableView::NewStencilImage()
@@ -633,8 +661,6 @@ void DaliTableView::OnScrollComplete( const Dali::Vector3&amp; position )
   // move focus to 1st item of new page
   FocusManager focusManager = FocusManager::Get();
   focusManager.SetCurrentFocusActor(mPages[mScrollView.GetCurrentPage()].GetChildAt(0) );
-
-  ApplyCubeEffectToActors();
 }
 bool DaliTableView::OnScrollTouched( Actor actor, const TouchEvent& event )
@@ -700,37 +726,65 @@ void DaliTableView::OnKeyEvent( const KeyEvent&amp; event )
   }
 }
-void DaliTableView::SetupBackground( Actor bubbleContainer, Actor backgroundLayer, const Vector2& size )
+void DaliTableView::SetupBackground( Actor bubbleContainer )
 {
   // Create distance field shape.
   BufferImage distanceField;
   Size imageSize( 512, 512 );
   CreateShapeImage( CIRCLE, imageSize, distanceField );
-  // Create solid background colour.
-  ImageActor backgroundColourActor = Dali::Toolkit::CreateSolidColorActor( BACKGROUND_COLOR );
-  backgroundColourActor.SetAnchorPoint( AnchorPoint::CENTER );
-  backgroundColourActor.SetParentOrigin( ParentOrigin::CENTER );
-  backgroundColourActor.SetSize( size * BACKGROUND_SIZE_SCALE );
-  backgroundColourActor.SetZ( BACKGROUND_Z );
-  backgroundColourActor.SetPositionInheritanceMode( DONT_INHERIT_POSITION );
-  backgroundLayer.Add( backgroundColourActor );
-
   // Add bubbles to the bubbleContainer.
   // Note: The bubbleContainer is parented externally to this function.
-  AddBackgroundActors( bubbleContainer, NUM_BACKGROUND_IMAGES, distanceField, size );
+  AddBackgroundActors( bubbleContainer, NUM_BACKGROUND_IMAGES, distanceField );
+}
+
+void DaliTableView::InitialiseBackgroundActors( Actor actor )
+{
+  // Delete current animations
+  mBackgroundAnimations.clear();
+
+  // Create new animations
+  const Vector3 size = actor.GetTargetSize();
+
+  for( unsigned int i = 0, childCount = actor.GetChildCount(); i < childCount; ++i )
+  {
+    Actor child = actor.GetChildAt( i );
+
+    const Vector3 childSize = child.GetTargetSize();
+
+    // Calculate a random position
+    Vector3 childPos( Random::Range( -size.x * 0.5f * BACKGROUND_SPREAD_SCALE, size.x * 0.5f * BACKGROUND_SPREAD_SCALE ),
+                      Random::Range( -size.y * 0.5f - childSize.height, size.y * 0.5f + childSize.height ),
+                      Random::Range( BUBBLE_MIN_Z, BUBBLE_MAX_Z ) );
+
+    child.SetPosition( childPos );
+
+    // Define bubble horizontal parallax and vertical wrapping
+    Constraint animConstraint = Constraint::New < Vector3 > ( Actor::Property::POSITION,
+      Source( mScrollView, mScrollView.GetPropertyIndex( ScrollView::SCROLL_POSITION_PROPERTY_NAME ) ),
+      Dali::ParentSource( Dali::Actor::Property::SIZE ),
+      AnimateBubbleConstraint( childPos, Random::Range( -0.85f, 0.25f ), childSize.height ) );
+    child.ApplyConstraint( animConstraint );
+
+    // Kickoff animation
+    Animation animation = Animation::New( Random::Range( 40.0f, 80.0f ) );
+    animation.MoveBy( child, Vector3( 0.0f, -1.0f, 0.0f ), AlphaFunctions::Linear );
+    animation.SetLooping( true );
+    animation.Play();
+    mBackgroundAnimations.push_back( animation );
+  }
 }
-void DaliTableView::AddBackgroundActors( Actor layer, int count, BufferImage distanceField, const Dali::Vector2& size )
+void DaliTableView::AddBackgroundActors( Actor layer, int count, BufferImage distanceField )
 {
   for( int i = 0; i < count; ++i )
   {
     float randSize = Random::Range( 10.0f, 400.0f );
     float hue = Random::Range( 0.3f, 1.0f );
-    Vector4 randColour( hue, hue*0.5, 0.0f, Random::Range( 0.3f, 0.6f ));
+    Vector4 randColour( hue, hue * 0.5, 0.0f, Random::Range( 0.3f, 0.6f ));
     ImageActor dfActor = ImageActor::New( distanceField );
-    mBackgroundActors.push_back( dfActor );
+    dfActor.SetRelayoutEnabled( false );
     dfActor.SetSize( Vector2( randSize, randSize ) );
     dfActor.SetParentOrigin( ParentOrigin::CENTER );
@@ -740,33 +794,10 @@ void DaliTableView::AddBackgroundActors( Actor layer, int count, BufferImage dis
     effect.SetOutlineParams( Vector2( 0.55f, 0.00f ) );
     effect.SetSmoothingEdge( 0.5f );
     layer.Add( dfActor );
-
-    // Setup animation
-    Vector3 actorPos(
-        Random::Range( -size.x * 0.5f * BACKGROUND_SPREAD_SCALE, size.x * 0.5f * BACKGROUND_SPREAD_SCALE ),
-        Random::Range( -size.y * 0.5f - randSize, size.y * 0.5f + randSize ),
-        Random::Range( BUBBLE_MIN_Z, BUBBLE_MAX_Z ) );
-    dfActor.SetPosition( actorPos );
-
-    // Define bubble horizontal parallax and vertical wrapping
-    Constraint animConstraint = Constraint::New < Vector3 > ( Actor::Property::POSITION,
-      Source( mScrollView, mScrollView.GetPropertyIndex( ScrollView::SCROLL_POSITION_PROPERTY_NAME ) ),
-      Dali::ParentSource( Dali::Actor::Property::SIZE ),
-      AnimateBubbleConstraint( actorPos, Random::Range( -0.85f, 0.25f ), randSize ) );
-    dfActor.ApplyConstraint( animConstraint );
-
-    // Kickoff animation
-    Animation animation = Animation::New( Random::Range( 40.0f, 200.0f ) );
-    KeyFrames keyframes = KeyFrames::New();
-    keyframes.Add( 0.0f, actorPos );
-    Vector3 toPos( actorPos );
-    toPos.y -= ( size.y + randSize );
-    keyframes.Add( 1.0f, toPos );
-    animation.AnimateBetween( Property( dfActor, Actor::Property::POSITION ), keyframes );
-    animation.SetLooping( true );
-    animation.Play();
-    mBackgroundAnimations.push_back( animation );
   }
+
+  // Positioning will occur when the layer is relaid out
+  layer.OnRelayoutSignal().Connect( this, &DaliTableView::InitialiseBackgroundActors );
 }
 void DaliTableView::CreateShapeImage( ShapeType shapeType, const Size& size, BufferImage& distanceFieldOut )
@@ -839,7 +870,7 @@ ImageActor DaliTableView::CreateLogo( std::string imagePath )
   ImageActor logo = ImageActor::New( image );
   logo.SetAnchorPoint( AnchorPoint::CENTER );
-  logo.SetParentOrigin( ParentOrigin::BOTTOM_CENTER );
+  logo.SetParentOrigin( ParentOrigin::CENTER );
   return logo;
 }
@@ -973,14 +1004,18 @@ void DaliTableView::OnLogoTapped( Dali::Actor actor, const Dali::TapGesture&amp; tap
       stream << "DALi Toolkit: " << TOOLKIT_MAJOR_VERSION << "." << TOOLKIT_MINOR_VERSION << "." << TOOLKIT_MICRO_VERSION << std::endl << "(" << TOOLKIT_BUILD_DATE << ")";
       mVersionPopup = Dali::Toolkit::Popup::New();
-      mVersionPopup.SetTitle( stream.str() );
       mVersionPopup.SetParentOrigin( ParentOrigin::CENTER );
       mVersionPopup.SetAnchorPoint( AnchorPoint::CENTER );
+      mVersionPopup.SetResizePolicy( FILL_TO_PARENT, WIDTH );
+      mVersionPopup.SetSizeMode( SIZE_RELATIVE_TO_PARENT );
+      mVersionPopup.SetSizeModeFactor( Vector3( 0.75f, 1.0f, 1.0f ) );
+      mVersionPopup.SetResizePolicy( FIT_TO_CHILDREN, HEIGHT );
+      mVersionPopup.SetTitle( stream.str() );
       mVersionPopup.HideTail();
       mVersionPopup.OutsideTouchedSignal().Connect( this, &DaliTableView::HideVersionPopup );
       mVersionPopup.HiddenSignal().Connect( this, &DaliTableView::PopupHidden );
-      Dali::Stage::GetCurrent().Add( mVersionPopup );
+      mVersionPopup.MarkDirtyForRelayout();
     }
     mVersionPopup.Show();
@@ -165,7 +165,7 @@ private: // Application callbacks &amp; implementation
    *
    * @return The Actor for the created tile.
    */
-  Dali::Actor CreateTile( const std::string& name, const std::string& title, const Dali::Size& parentSize, bool addBackground );
+  Dali::Actor CreateTile( const std::string& name, const std::string& title, const Dali::Vector3& sizeMultiplier, bool addBackground );
   /**
    * Create a stencil image
@@ -276,9 +276,8 @@ private: // Application callbacks &amp; implementation
    * Create a depth field background
    *
    * @param[in] bubbleLayer Add the graphics to this layer
-   * @param[in] backgroundLayer Add the background to this layer
    */
-  void SetupBackground(  Dali::Actor bubbleLayer, Dali::Actor backgroundLayer, const Dali::Vector2& size );
+  void SetupBackground( Dali::Actor bubbleLayer );
   /**
    * Create background actors for the given layer
@@ -286,9 +285,8 @@ private: // Application callbacks &amp; implementation
    * @param[in] layer The layer to add the actors to
    * @param[in] count The number of actors to generate
    * @param[in] distanceField The distance field bitmap to use
-   * @param[in] size The size of the actor
    */
-  void AddBackgroundActors( Dali::Actor layer, int count, Dali::BufferImage distanceField, const Dali::Vector2& size );
+  void AddBackgroundActors( Dali::Actor layer, int count, Dali::BufferImage distanceField );
   /**
    * Create a bitmap with the specified shape and also output a distance field
@@ -378,6 +376,20 @@ private: // Application callbacks &amp; implementation
    */
   void PopupHidden();
+ /*
+  * @brief Callback called when the buttons page actor is relaid out
+  *
+  * @param[in] actor The page actor
+  */
+ void OnButtonsPageRelayout( const Dali::Actor& actor );
+
+ /**
+  * @brief Callback called to set up background actors
+  *
+  * @param[in] actor The actor raising the callback
+  */
+ void InitialiseBackgroundActors( Dali::Actor actor );
+
 private:
   Dali::Application&              mApplication;              ///< Application instance.
@@ -385,7 +397,6 @@ private:
   Dali::Toolkit::TableView        mRootActor;                ///< All content (excluding background is anchored to this Actor)
   Dali::Animation                 mRotateAnimation;          ///< Animation to rotate and resize mRootActor.
   Dali::ImageActor                mBackground;               ///< Background's static image.
-  Dali::ImageActor                mLogo;                     ///< Logo's static image.
   Dali::Animation                 mPressedAnimation;         ///< Button press scaling animation.
   Dali::Layer                     mScrollViewLayer;          ///< ScrollView resides on a separate layer.
   Dali::Toolkit::ScrollView       mScrollView;               ///< ScrollView container (for all Examples)
@@ -413,6 +424,7 @@ private:
   bool                            mSortAlphabetically:1;     ///< Sort examples alphabetically.
   bool                            mBackgroundAnimsPlaying:1; ///< Are background animations playing
   bool                            mVersionPopupShown:1;      ///< Whehter the version popup is shown or not
+
 };
 #endif // __DALI_DEMO_H__
@@ -52,6 +52,7 @@ public:
     //Create a view
     mView = Dali::Toolkit::View::New();
+    mView.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
     stage.Add( mView );
     //Set background image for the view
@@ -421,7 +421,8 @@ private:
     mLevelContainer = Actor::New();
     mLevelContainer.SetAnchorPoint( AnchorPoint::CENTER );
     mLevelContainer.SetParentOrigin( ParentOrigin::CENTER );
-    mLevelContainer.SetSizeMode( SIZE_EQUAL_TO_PARENT );
+    mLevelContainer.SetRelayoutEnabled( true );
+    mLevelContainer.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
     mContentLayer.Add( mLevelContainer );
     mBrickCount = 0;
@@ -593,6 +594,7 @@ private:
     ImageActor brick = ImageActor::New(img);
     brick.SetParentOrigin(ParentOrigin::TOP_LEFT);
     brick.SetAnchorPoint(AnchorPoint::CENTER);
+    brick.SetRelayoutEnabled( false );
     brick.SetSize( brickSize );
     brick.SetPosition( Vector3( position ) );
@@ -625,6 +627,7 @@ private:
     ImageActor actor = ImageActor::New(img);
     actor.SetParentOrigin(ParentOrigin::TOP_LEFT);
     actor.SetAnchorPoint(AnchorPoint::CENTER);
+    actor.SetRelayoutEnabled( false );
     return actor;
   }
@@ -280,6 +280,7 @@ public:
     mFiles.clear();
     mItemView = ItemView::New(*this);
+    mItemView.SetRelayoutEnabled( false );
     stage.Add( mItemView );
     mItemView.SetParentOrigin(ParentOrigin::CENTER);
     mItemView.SetAnchorPoint(AnchorPoint::CENTER);
@@ -455,6 +456,8 @@ public:
     builder.AddActors( layer );
+    // Force relayout on layer
+    layer.RelayoutRequestTree();
   }
@@ -127,14 +127,16 @@ class ButtonsController: public ConnectionTracker
     radioGroup2Background.SetAnchorPoint( AnchorPoint::TOP_LEFT );
     radioGroup2Background.SetParentOrigin( ParentOrigin::TOP_LEFT );
     radioGroup2Background.SetPosition( DP(MARGIN_SIZE), DP(yPos) );
-    radioGroup2Background.SetSize( DP(348), DP(GROUP2_HEIGHT) );
+    radioGroup2Background.SetRelayoutEnabled( true );
+    radioGroup2Background.SetPreferredSize( Vector2( DP(348), DP(GROUP2_HEIGHT) ) );
     mContentLayer.Add( radioGroup2Background );
     Actor radioButtonsGroup2 = Actor::New();
     radioButtonsGroup2.SetParentOrigin( ParentOrigin::TOP_LEFT );
     radioButtonsGroup2.SetAnchorPoint( AnchorPoint::TOP_LEFT );
     radioButtonsGroup2.SetPosition( DP(MARGIN_SIZE), DP(MARGIN_SIZE) );
-    radioButtonsGroup2.SetSize( DP(100), DP(160) );
+    radioButtonsGroup2.SetRelayoutEnabled( true );
+    radioButtonsGroup2.SetPreferredSize( Vector2( DP(100), DP(160) ) );
     radioGroup2Background.Add( radioButtonsGroup2 );
@@ -143,7 +145,7 @@ class ButtonsController: public ConnectionTracker
     // Radio 1
     {
       ImageActor imageActor = ImageActor::New( ResourceImage::New( SMALL_IMAGE_1 ) );
-      imageActor.SetSize( DP(RADIO_LABEL_THUMBNAIL_SIZE), DP(RADIO_LABEL_THUMBNAIL_SIZE) );
+      imageActor.SetPreferredSize( Vector2( DP(RADIO_LABEL_THUMBNAIL_SIZE), DP(RADIO_LABEL_THUMBNAIL_SIZE) ) );
       mRadioButtonImage1 = Dali::Toolkit::RadioButton::New( imageActor );
       mRadioButtonImage1.SetParentOrigin( ParentOrigin::TOP_LEFT );
       mRadioButtonImage1.SetAnchorPoint( AnchorPoint::TOP_LEFT );
@@ -158,7 +160,7 @@ class ButtonsController: public ConnectionTracker
       radioY += RADIO_LABEL_THUMBNAIL_SIZE + RADIO_IMAGE_SPACING;
       ImageActor imageActor = ImageActor::New( ResourceImage::New( SMALL_IMAGE_2 ) );
-      imageActor.SetSize( DP(RADIO_LABEL_THUMBNAIL_SIZE), DP(RADIO_LABEL_THUMBNAIL_SIZE) );
+      imageActor.SetPreferredSize( Vector2( DP(RADIO_LABEL_THUMBNAIL_SIZE), DP(RADIO_LABEL_THUMBNAIL_SIZE) ) );
       mRadioButtonImage2 = Dali::Toolkit::RadioButton::New( imageActor );
       mRadioButtonImage2.SetParentOrigin( ParentOrigin::TOP_LEFT );
@@ -173,7 +175,7 @@ class ButtonsController: public ConnectionTracker
       radioY += RADIO_LABEL_THUMBNAIL_SIZE + RADIO_IMAGE_SPACING;
       ImageActor imageActor = ImageActor::New( ResourceImage::New( SMALL_IMAGE_3 ) );
-      imageActor.SetSize( DP(RADIO_LABEL_THUMBNAIL_SIZE), DP(RADIO_LABEL_THUMBNAIL_SIZE) );
+      imageActor.SetPreferredSize( Vector2( DP(RADIO_LABEL_THUMBNAIL_SIZE), DP(RADIO_LABEL_THUMBNAIL_SIZE) ) );
       mRadioButtonImage3 = Dali::Toolkit::RadioButton::New( imageActor );
       mRadioButtonImage3.SetParentOrigin( ParentOrigin::TOP_LEFT );
@@ -188,8 +190,8 @@ class ButtonsController: public ConnectionTracker
     mUpdateButton.SetParentOrigin( ParentOrigin::BOTTOM_CENTER );
     mUpdateButton.SetAnchorPoint( AnchorPoint::TOP_CENTER );
     mUpdateButton.SetPosition( 0, DP(MARGIN_SIZE) );
-    mUpdateButton.SetLabel("Select");
-    mUpdateButton.SetSize( DP(100), DP(BUTTON_HEIGHT) );
+    mUpdateButton.SetLabel( "Select" );
+    mUpdateButton.SetPreferredSize( Vector2( DP(100), DP(BUTTON_HEIGHT) ) );
     mUpdateButton.SetSelectedImage( Dali::ResourceImage::New( PUSHBUTTON_PRESS_IMAGE ) );
     mUpdateButton.SetDisabledImage( Dali::ResourceImage::New( PUSHBUTTON_DISABLED_IMAGE ) );
@@ -208,7 +210,7 @@ class ButtonsController: public ConnectionTracker
     mImage.SetParentOrigin( ParentOrigin::TOP_RIGHT );
     mImage.SetAnchorPoint( AnchorPoint::TOP_LEFT );
     mImage.SetPosition( DP(MARGIN_SIZE), 0 );
-    mImage.SetSize( DP(218), DP(218) );
+    mImage.SetPreferredSize( Vector2( DP(218), DP(218) ) );
     radioButtonsGroup2.Add( mImage );
     // The enable/disable radio group
@@ -218,7 +220,8 @@ class ButtonsController: public ConnectionTracker
     radioGroup1Background.SetAnchorPoint( AnchorPoint::TOP_LEFT );
     radioGroup1Background.SetParentOrigin( ParentOrigin::TOP_LEFT );
     radioGroup1Background.SetPosition( DP(MARGIN_SIZE), DP(yPos) );
-    radioGroup1Background.SetSize( DP(348), DP(GROUP1_HEIGHT) );
+    radioGroup1Background.SetRelayoutEnabled( true );
+    radioGroup1Background.SetPreferredSize( Vector2( DP(348), DP(GROUP1_HEIGHT) ) );
     mContentLayer.Add( radioGroup1Background );
     // Radio group
@@ -232,12 +235,14 @@ class ButtonsController: public ConnectionTracker
     // First radio button
     {
       Toolkit::TableView tableView = Toolkit::TableView::New( 1, 2 );
-      tableView.SetSize( DP(260), DP(RADIO_LABEL_THUMBNAIL_SIZE) );
+      tableView.SetPreferredSize( Vector2( DP(260), 0.0f ) );
+      tableView.SetResizePolicy( USE_NATURAL_SIZE, HEIGHT );
       ImageActor imageActor = ImageActor::New( ResourceImage::New( ENABLED_IMAGE ) );
-      imageActor.SetSize( DP(RADIO_LABEL_THUMBNAIL_SIZE), DP(RADIO_LABEL_THUMBNAIL_SIZE) );
+      imageActor.SetPreferredSize( Vector2( DP(RADIO_LABEL_THUMBNAIL_SIZE), DP(RADIO_LABEL_THUMBNAIL_SIZE) ) );
+      imageActor.SetResizePolicy( FIXED, ALL_DIMENSIONS );
+      imageActor.SetPadding( Padding( DP(20.0f), 0.0f, 0.0f, 0.0f ) );
       tableView.AddChild( imageActor, Toolkit::TableView::CellPosition( 0, 1 ) );
-      tableView.SetFixedWidth( 1, DP(RADIO_LABEL_THUMBNAIL_SIZE) );
       Toolkit::RadioButton radioButton = Dali::Toolkit::RadioButton::New( tableView );
       radioButton.SetName( "radio-select-enable" );
@@ -271,7 +276,8 @@ class ButtonsController: public ConnectionTracker
     checkBoxBackground.SetAnchorPoint( AnchorPoint::TOP_LEFT );
     checkBoxBackground.SetParentOrigin( ParentOrigin::TOP_LEFT );
     checkBoxBackground.SetPosition( DP(MARGIN_SIZE), DP(yPos) );
-    checkBoxBackground.SetSize( DP(430), DP(GROUP3_HEIGHT) );
+    checkBoxBackground.SetRelayoutEnabled( true );
+    checkBoxBackground.SetPreferredSize( Vector2( DP(430), DP(GROUP3_HEIGHT) ) );
     mContentLayer.Add( checkBoxBackground );
     Dali::Image unselected = Dali::ResourceImage::New( CHECKBOX_UNSELECTED_IMAGE );
@@ -331,7 +337,8 @@ class ButtonsController: public ConnectionTracker
     toggleBackground.SetAnchorPoint( AnchorPoint::TOP_LEFT );
     toggleBackground.SetParentOrigin( ParentOrigin::TOP_LEFT );
     toggleBackground.SetPosition( DP(MARGIN_SIZE), DP(yPos) );
-    toggleBackground.SetSize( DP(150 + MARGIN_SIZE * 2), DP(GROUP4_HEIGHT) );
+    toggleBackground.SetRelayoutEnabled( true );
+    toggleBackground.SetPreferredSize( Vector2( DP(150 + MARGIN_SIZE * 2), DP(GROUP4_HEIGHT) ) );
     mContentLayer.Add( toggleBackground );
     Toolkit::PushButton toggleButton = Toolkit::PushButton::New();
@@ -340,7 +347,7 @@ class ButtonsController: public ConnectionTracker
     toggleButton.SetAnchorPoint( AnchorPoint::TOP_LEFT );
     toggleButton.SetPosition( DP(MARGIN_SIZE), DP(MARGIN_SIZE) );
     toggleButton.SetLabel( "Unselected" );
-    toggleButton.SetSize( DP(150), DP(BUTTON_HEIGHT) );
+    toggleButton.SetPreferredSize( Vector2( DP(150), DP(BUTTON_HEIGHT) ) );
     toggleButton.SetSelectedImage( Dali::ResourceImage::New( PUSHBUTTON_PRESS_IMAGE ) );
     toggleButton.SetDisabledImage( Dali::ResourceImage::New( PUSHBUTTON_DISABLED_IMAGE ) );
@@ -477,6 +477,7 @@ public:
     // create and setup the scroll view...
     mScrollView = ScrollView::New();
+    mScrollView.SetRelayoutEnabled( false );
     mScrollView.SetSize(stageSize);
     // attach Wobble Effect to ScrollView
@@ -488,7 +489,8 @@ public:
     mScrollView.SetParentOrigin(ParentOrigin::CENTER);
     // Scale ScrollView to fit parent (mContentLayer)
-    mScrollView.SetSizeMode( SIZE_EQUAL_TO_PARENT );
+    mScrollView.SetRelayoutEnabled( true );
+    mScrollView.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
     // Add the scroll view to the content layer
     mContentLayer.Add(mScrollView);
@@ -515,6 +517,7 @@ public:
     Cluster clusterActor = Cluster::New(style);
     clusterActor.SetParentOrigin(ParentOrigin::CENTER);
     clusterActor.SetAnchorPoint(AnchorPoint::CENTER);
+    clusterActor.SetRelayoutEnabled( false );
     Vector2 stageSize = Dali::Stage::GetCurrent().GetSize();
     float minStageDimension = std::min(stageSize.x, stageSize.y);
@@ -533,6 +536,7 @@ public:
     backgroundAttributes.SetScalingMode( Dali::ImageAttributes::ShrinkToFit );
     Image bg = ResourceImage::New( CLUSTER_BACKGROUND_IMAGE_PATH );
     ImageActor image = ImageActor::New(bg);
+    image.SetRelayoutEnabled( false );
     clusterActor.SetBackgroundImage(image);
     // Add actors (pictures) as the children of the cluster
@@ -576,6 +580,7 @@ public:
     shadowActor.SetPosition(Vector3(0.0f, 0.0f, -1.0f));
     // Apply size-relative mode to auto-size the image shadow
+    shadowActor.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
     shadowActor.SetSizeMode( SIZE_RELATIVE_TO_PARENT );
     shadowActor.SetSizeModeFactor( ShadowProperty::SIZE_SCALE );
     actor.Add( shadowActor );
@@ -585,7 +590,7 @@ public:
     ImageActor imageActor = ImageActor::New( image );
     imageActor.SetParentOrigin( ParentOrigin::CENTER );
     imageActor.SetAnchorPoint( AnchorPoint::CENTER );
-    imageActor.SetSizeMode( SIZE_EQUAL_TO_PARENT );
+    imageActor.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
     actor.Add( imageActor );
     // Add a border image child actor (with a fixed size offset from parent).
@@ -595,6 +600,7 @@ public:
     borderActor.SetStyle( ImageActor::STYLE_NINE_PATCH );
     borderActor.SetNinePatchBorder( CLUSTER_IMAGE_BORDER_ABSOLUTE );
     borderActor.SetPosition( Vector3( 0.0f, 0.0f, 1.0f ) );
+    borderActor.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
     borderActor.SetSizeMode( SIZE_FIXED_OFFSET_FROM_PARENT );
     borderActor.SetSizeModeFactor( Vector3( CLUSTER_IMAGE_BORDER_INDENT - 1.0f, CLUSTER_IMAGE_BORDER_INDENT - 1.0f, 0.0f ) * 2.0f );
     actor.Add( borderActor );
@@ -625,7 +631,8 @@ public:
     mScrollView.Add(pageView);
     pageView.SetParentOrigin(ParentOrigin::CENTER);
     pageView.SetPosition(Vector3(stageSize.width * column, 0.0f, 0.0f));
-    pageView.SetSizeMode( SIZE_EQUAL_TO_PARENT );
+    pageView.SetRelayoutEnabled( true );
+    pageView.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
     // Create cluster actors, add them to scroll view, and set the shear effect with the given center point.
     Cluster cluster = CreateClusterActor(clusterType, style);
@@ -283,6 +283,7 @@ void CubeTransitionApp::OnInit( Application&amp; application )
   mCurrentImage = ImageActor::New( LoadStageFillingImage( IMAGES[mIndex] ) );
   mCurrentImage.SetPositionInheritanceMode( USE_PARENT_POSITION );
   mCurrentImage.ApplyConstraint( mImageConstraint );
+  mCurrentImage.SetRelayoutEnabled( false );
   mParent.Add( mCurrentImage );
   mCurrentEffect = mCubeWaveEffect;
@@ -322,6 +323,7 @@ void CubeTransitionApp::GoToNextImage()
   mNextImage.SetPositionInheritanceMode(USE_PARENT_POSITION);
   mNextImage.ApplyConstraint( mImageConstraint );
+  mNextImage.SetRelayoutEnabled( false );
   mCurrentEffect.SetTargetImage(mNextImage);
   if( image.GetLoadingState() == ResourceLoadingSucceeded )
   {
@@ -44,9 +44,9 @@ public:
     // Get a handle to the stage
     Stage stage = Stage::GetCurrent();
-    TextLabel textLabel = TextLabel::New();
+    TextLabel textLabel = TextLabel::New( "Hello World" );
     textLabel.SetAnchorPoint( AnchorPoint::TOP_LEFT );
-    textLabel.SetProperty( TextLabel::Property::TEXT, "Hello World" );
+    textLabel.SetName( "hello-world-label" );
     stage.Add( textLabel );
     // Respond to a click anywhere on the stage
@@ -421,7 +421,8 @@ public:
     // coordinates in a frame defined by a parent actor:
     Actor gridActor = Actor::New();
-    gridActor.SetSizeMode( SIZE_EQUAL_TO_PARENT );
+    gridActor.SetRelayoutEnabled( true );
+    gridActor.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
     gridActor.SetParentOrigin( ParentOrigin::CENTER );
     gridActor.SetAnchorPoint( AnchorPoint::CENTER );
@@ -279,7 +279,8 @@ public:
     mDeleteButton.SetDrawMode( DrawMode::OVERLAY );
     mDeleteButton.SetBackgroundImage( ResourceImage::New( TOOLBAR_IMAGE ) );
     mDeleteButton.SetButtonImage( ResourceImage::New( DELETE_IMAGE ) );
-    mDeleteButton.SetSize( stageSize.width * 0.15f, stageSize.width * 0.15f );
+    mDeleteButton.SetResizePolicy( FIXED, ALL_DIMENSIONS );
+    mDeleteButton.SetPreferredSize( Vector2( stageSize.width * 0.15f, stageSize.width * 0.15f ) );
     mDeleteButton.ClickedSignal().Connect( this, &ItemViewExample::OnDeleteButtonClicked);
     mDeleteButton.SetLeaveRequired( true );
     mDeleteButton.SetVisible( false );
@@ -293,7 +294,8 @@ public:
     mInsertButton.SetDrawMode( DrawMode::OVERLAY );
     mInsertButton.SetBackgroundImage( ResourceImage::New( TOOLBAR_IMAGE ) );
     mInsertButton.SetButtonImage( ResourceImage::New( INSERT_IMAGE ) );
-    mInsertButton.SetSize( stageSize.width * 0.15f, stageSize.width * 0.15f );
+    mInsertButton.SetResizePolicy( FIXED, ALL_DIMENSIONS );
+    mInsertButton.SetPreferredSize( Vector2( stageSize.width * 0.15f, stageSize.width * 0.15f ) );
     mInsertButton.ClickedSignal().Connect( this, &ItemViewExample::OnInsertButtonClicked);
     mInsertButton.SetLeaveRequired( true );
     mInsertButton.SetVisible( false );
@@ -307,7 +309,8 @@ public:
     mReplaceButton.SetDrawMode( DrawMode::OVERLAY );
     mReplaceButton.SetBackgroundImage( ResourceImage::New( TOOLBAR_IMAGE ) );
     mReplaceButton.SetButtonImage( ResourceImage::New( REPLACE_IMAGE ) );
-    mReplaceButton.SetSize( stageSize.width * 0.15f, stageSize.width * 0.15f );
+    mReplaceButton.SetResizePolicy( FIXED, ALL_DIMENSIONS );
+    mReplaceButton.SetPreferredSize( Vector2( stageSize.width * 0.15f, stageSize.width * 0.15f ) );
     mReplaceButton.ClickedSignal().Connect( this, &ItemViewExample::OnReplaceButtonClicked);
     mReplaceButton.SetLeaveRequired( true );
     mReplaceButton.SetVisible( false );
@@ -316,6 +319,7 @@ public:
     // Create the item view actor
     mImageAtlas = CreateImageAtlas();
     mItemView = ItemView::New(*this);
+    mItemView.SetRelayoutEnabled( false );
     mItemView.SetParentOrigin(ParentOrigin::CENTER);
     mItemView.SetAnchorPoint(AnchorPoint::CENTER);
@@ -895,6 +899,7 @@ public: // From ItemFactory
     borderActor.SetStyle( ImageActor::STYLE_NINE_PATCH );
     borderActor.SetNinePatchBorder( Vector4( ITEM_IMAGE_BORDER_LEFT, ITEM_IMAGE_BORDER_TOP, ITEM_IMAGE_BORDER_RIGHT, ITEM_IMAGE_BORDER_BOTTOM ) );
     borderActor.SetColorMode( USE_OWN_MULTIPLY_PARENT_COLOR ); // darken with parent image-actor
+    borderActor.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
     borderActor.SetSizeMode( SIZE_FIXED_OFFSET_FROM_PARENT );
     borderActor.SetSizeModeFactor( ITEM_BORDER_MARGIN_SIZE );
     actor.Add(borderActor);
@@ -906,6 +911,7 @@ public: // From ItemFactory
     // Add a checkbox child actor; invisible until edit-mode is enabled
     ImageActor checkbox = ImageActor::New( mWhiteImage );
+    checkbox.SetRelayoutEnabled( false );
     checkbox.SetName( "CheckBox" );
     checkbox.SetColor( Vector4(0.0f,0.0f,0.0f,0.6f) );
     checkbox.SetParentOrigin( ParentOrigin::TOP_RIGHT );
@@ -922,6 +928,7 @@ public: // From ItemFactory
     actor.Add( checkbox );
     ImageActor tick = ImageActor::New( ResourceImage::New(SELECTED_IMAGE) );
+    tick.SetRelayoutEnabled( false );
     tick.SetColorMode( USE_OWN_COLOR );
     tick.SetName( "Tick" );
     tick.SetParentOrigin( ParentOrigin::TOP_RIGHT );
@@ -976,12 +983,12 @@ private:
     mMenu = Toolkit::Popup::New();
     mMenu.SetParentOrigin( ParentOrigin::BOTTOM_LEFT );
     mMenu.SetAnchorPoint( AnchorPoint::BOTTOM_LEFT );
+    mMenu.SetResizePolicy( FIXED, ALL_DIMENSIONS );
+    mMenu.SetPreferredSize( Vector2( popupWidth, MENU_OPTION_HEIGHT * 2 ) );
     mMenu.OutsideTouchedSignal().Connect( this, &ItemViewExample::HideMenu );
-    stage.Add( mMenu );
     TableView tableView = TableView::New( 0, 0 );
-    Vector2 tableSize = Vector2( popupWidth, MENU_OPTION_HEIGHT * 2 );
-    tableView.SetSize( tableSize );
+    tableView.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
     mMenu.Add( tableView );
     Slider slider = Slider::New();
@@ -990,9 +997,9 @@ private:
     slider.SetProperty( Slider::Property::VALUE, mDurationSeconds );
     slider.SetProperty( Slider::Property::VALUE_PRECISION, 2 );
     slider.SetProperty( Slider::Property::SHOW_POPUP, true );
+    slider.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
     slider.ValueChangedSignal().Connect( this, &ItemViewExample::SliderValueChange );
     tableView.AddChild( slider, TableView::CellPosition( 0, 0 ) );
-    tableView.SetRelativeHeight( 0, 0.5f );
     mMenu.Show();
     mMenuShown = true;
@@ -265,7 +265,7 @@ class LoggingController: public ConnectionTracker
     mContentLayer.Add( createGroupBackground );
     int buttonXDP = DP(MARGIN_SIZE);
-    int buttonWidthDP = (createGroupBackground.GetSize().width - DP(MARGIN_SIZE) * 3) / 2;
+    int buttonWidthDP = (createGroupBackground.GetTargetSize().width - DP(MARGIN_SIZE) * 3) / 2;
     {
       Toolkit::PushButton button = Toolkit::PushButton::New();
@@ -316,7 +316,7 @@ class LoggingController: public ConnectionTracker
     mContentLayer.Add( timingGroupBackground );
     buttonXDP = DP(MARGIN_SIZE);
-    buttonWidthDP = (timingGroupBackground.GetSize().width - DP(MARGIN_SIZE) * 3) / 2;
+    buttonWidthDP = (timingGroupBackground.GetTargetSize().width - DP(MARGIN_SIZE) * 3) / 2;
     {
       Toolkit::PushButton button = Toolkit::PushButton::New();
@@ -367,7 +367,7 @@ class LoggingController: public ConnectionTracker
     mContentLayer.Add( enableGroupBackground );
     buttonXDP = DP(MARGIN_SIZE);
-    buttonWidthDP = (enableGroupBackground.GetSize().width - DP(MARGIN_SIZE) * 3) / 2;
+    buttonWidthDP = (enableGroupBackground.GetTargetSize().width - DP(MARGIN_SIZE) * 3) / 2;
     {
       Toolkit::PushButton button = Toolkit::PushButton::New();
@@ -489,7 +489,7 @@ class LoggingController: public ConnectionTracker
     mContentLayer.Add( vsyncGroupBackground );
     buttonXDP = DP(MARGIN_SIZE);
-    buttonWidthDP = vsyncGroupBackground.GetSize().width - DP(MARGIN_SIZE) * 2;
+    buttonWidthDP = vsyncGroupBackground.GetTargetSize().width - DP(MARGIN_SIZE) * 2;
     {
       Toolkit::PushButton button = Toolkit::PushButton::New();
@@ -227,12 +227,14 @@ public:
     // Create magnifier (controlled by human touch)
     Layer overlay = Layer::New();
+    overlay.SetRelayoutEnabled( false );
     overlay.SetSensitive(false);
     overlay.SetParentOrigin( ParentOrigin::CENTER );
     overlay.SetSize(mStageSize);
     Stage::GetCurrent().Add(overlay);
     mMagnifier = Toolkit::Magnifier::New();
+    mMagnifier.SetRelayoutEnabled( false );
     mMagnifier.SetSourceActor( mView.GetBackgroundLayer() );
     mMagnifier.SetSize( MAGNIFIER_SIZE * mStageSize.width );  // Size of magnifier is in relation to stage width
     mMagnifier.SetMagnificationFactor( MAGNIFICATION_FACTOR );
@@ -251,6 +253,7 @@ public:
     // Create bouncing magnifier automatically bounces around screen.
     mBouncingMagnifier = Toolkit::Magnifier::New();
+    mBouncingMagnifier.SetRelayoutEnabled( false );
     mBouncingMagnifier.SetSourceActor( mView.GetBackgroundLayer() );
     mBouncingMagnifier.SetSize( MAGNIFIER_SIZE * mStageSize.width ); // Size of magnifier is in relation to stage width
     mBouncingMagnifier.SetMagnificationFactor( MAGNIFICATION_FACTOR );
@@ -78,14 +78,20 @@ class PortraitPageFactory : public PageFactory
    */
   virtual Actor NewPage( unsigned int pageId )
   {
+    ImageActor page;
+
     if( pageId == 0 )
     {
-      return ImageActor::New( ResourceImage::New( BOOK_COVER_PORTRAIT ) );
+      page = ImageActor::New( ResourceImage::New( BOOK_COVER_PORTRAIT ) );
     }
     else
     {
-      return ImageActor::New( ResourceImage::New( PAGE_IMAGES_PORTRAIT[ (pageId-1) % NUMBER_OF_PORTRAIT_IMAGE ] ) );
+      page = ImageActor::New( ResourceImage::New( PAGE_IMAGES_PORTRAIT[ (pageId-1) % NUMBER_OF_PORTRAIT_IMAGE ] ) );
     }
+
+    page.SetRelayoutEnabled( false );
+
+    return page;
   }
 };
@@ -120,6 +126,10 @@ class LandscapePageFactory : public PageFactory
       pageBack = ImageActor::New( ResourceImage::New( PAGE_IMAGES_LANDSCAPE[ (imageId+1) % NUMBER_OF_LANDSCAPE_IMAGE ] ) );
     }
     pageFront.Add(pageBack);
+
+    pageFront.SetRelayoutEnabled( false );
+    pageBack.SetRelayoutEnabled( false );
+
     return pageFront;
   }
 };
@@ -223,6 +233,7 @@ void PageTurnController::OnInit( Application&amp; app )
   // Create default View.
   mView = View::New();
+  mView.SetRelayoutEnabled( false );
   stage.Add( mView );
   Dali::Window winHandle = app.GetWindow();
@@ -236,6 +247,7 @@ void PageTurnController::OnInit( Application&amp; app )
   mView.OrientationAnimationStartedSignal().Connect( this, &PageTurnController::OnOrientationAnimationStarted );
   mPageTurnPortraitView = PageTurnPortraitView::New( mPortraitPageFactory, stageSize );
+  mPageTurnPortraitView.SetRelayoutEnabled( false );
   mPageTurnPortraitView.SetSpineShadowParameter( Vector2(70.f, 30.f) );
   mPageTurnPortraitView.PageTurnStartedSignal().Connect( this, &PageTurnController::OnPageStartedTurn );
   mPageTurnPortraitView.PageTurnFinishedSignal().Connect( this, &PageTurnController::OnPageFinishedTurn );
@@ -244,6 +256,7 @@ void PageTurnController::OnInit( Application&amp; app )
   mPageTurnPortraitView.SetPositionInheritanceMode( USE_PARENT_POSITION );
   mPageTurnLandscapeView = PageTurnLandscapeView::New( mLandscapePageFactory, Vector2(stageSize.y*0.5f, stageSize.x) );
+  mPageTurnLandscapeView.SetRelayoutEnabled( false );
   mPageTurnLandscapeView.PageTurnStartedSignal().Connect( this, &PageTurnController::OnPageStartedTurn );
   mPageTurnLandscapeView.PageTurnFinishedSignal().Connect( this, &PageTurnController::OnPageFinishedTurn );
   mPageTurnLandscapeView.PagePanStartedSignal().Connect( this, &PageTurnController::OnPageStartedPan );
@@ -63,7 +63,7 @@ public:
   */
   Actor CreateVectorComponentControl( const std::string& label, const Vector3& size, bool(PathController::*callback)(Slider,float) )
   {
-    return Actor(); // TODO
+    return Actor();
   }
   /**
@@ -75,6 +75,7 @@ public:
     //TextInput
     Dali::Layer controlsLayer = Dali::Layer::New();
+    controlsLayer.SetRelayoutEnabled( false );
     controlsLayer.SetSize( stage.GetSize().x, stage.GetSize().y*0.3f, 0.0 );
     controlsLayer.SetPosition( 0.0f, stage.GetSize().y*0.8f, 0.0f );
     controlsLayer.SetAnchorPoint( AnchorPoint::TOP_LEFT);
@@ -174,6 +175,7 @@ public:
       if( !mControlPoint[index] )
       {
         mControlPoint[index] = Toolkit::CreateSolidColorActor(Vector4(1.0f,1.0f,1.0f,1.0f));
+        mControlPoint[index].SetRelayoutEnabled( false );
         mControlPoint[index].SetParentOrigin( ParentOrigin::TOP_LEFT);
         mControlPoint[index].SetAnchorPoint( AnchorPoint::CENTER );
         mControlPoint[index].SetSize( 20.0f, 20.0f );
@@ -195,6 +197,7 @@ public:
       if( !mControlPoint[index])
       {
         mControlPoint[index] = Toolkit::CreateSolidColorActor(Vector4(1.0f,1.0f,1.0f,1.0f));
+        mControlPoint[index].SetRelayoutEnabled( false );
         mControlPoint[index].SetParentOrigin( ParentOrigin::TOP_LEFT);
         mControlPoint[index].SetAnchorPoint( AnchorPoint::CENTER );
         mControlPoint[index].SetSize( 20.0f, 20.0f );
@@ -430,6 +433,7 @@ public:
     ImageAttributes attributes;
     Image img = ResourceImage::New(ACTOR_IMAGE, attributes );
     mActor = ImageActor::New( img );
+    mActor.SetRelayoutEnabled( false );
     mActor.SetAnchorPoint( AnchorPoint::CENTER );
     mActor.SetSize( 100, 50, 1 );
     stage.Add( mActor );
+/*
+ * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include "launcher.h"
+
+// EXTERNAL INCLUDES
+#include <fstream>
+#include <sys/stat.h>
+#include <dali/integration-api/debug.h>
+
+
+
+using namespace Dali;
+
+#define TOKEN_STRING(x) #x
+
+namespace
+{
+std::string GetFileContents(const std::string& filename)
+{
+  std::ifstream t(filename.c_str());
+  return std::string((std::istreambuf_iterator<char>(t)),
+                     std::istreambuf_iterator<char>());
+};
+
+} // unnamed namespace
+
+Launcher::Launcher( Dali::Application application, std::string layoutFileName, std::string scriptFileName )
+: mApplication( application ),
+  mJSONFileName(layoutFileName ),
+  mJavaScriptFileName( scriptFileName )
+{
+
+  mApplication.InitSignal().Connect( this, &Launcher::Create );
+}
+
+Launcher::~Launcher()
+{
+}
+
+void Launcher::Create( Dali::Application& application )
+{
+  // Get a handle to the stage
+  Stage stage = Stage::GetCurrent();
+
+  // change the background color to purple
+  Stage::GetCurrent().SetBackgroundColor( Vector4(0.2,0.2,0.4,1.0) );
+
+  // Try loading a JSON file
+  if( !mJSONFileName.empty() )
+  {
+    mBuilder = Toolkit::Builder::New();
+
+    Property::Map defaultDirs;
+    defaultDirs[ TOKEN_STRING(DALI_IMAGE_DIR) ]  = DALI_IMAGE_DIR;
+    defaultDirs[ TOKEN_STRING(DALI_MODEL_DIR) ]  = DALI_MODEL_DIR;
+    defaultDirs[ TOKEN_STRING(DALI_SCRIPT_DIR) ] = DALI_SCRIPT_DIR;
+    mBuilder.AddConstants( defaultDirs );
+
+    std::string json_data(GetFileContents( mJSONFileName ));
+    mBuilder.LoadFromString(json_data);
+    mBuilder.AddActors( stage.GetRootLayer() );
+  }
+
+  // Try load a JavaScript file
+  if( !mJavaScriptFileName.empty() )
+  {
+    // execute the script
+    mScript = Toolkit::Script::New();
+
+    mScript.ExecuteFile( mJavaScriptFileName);
+  }
+}
+
+void Launcher::MainLoop()
+{
+  mApplication.MainLoop();
+}
+#ifndef DALI_APP_H
+#define DALI_APP_H
+
+/*
+ * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#include <dali/dali.h>
+#include <dali-toolkit/dali-toolkit.h>
+
+/**
+ * Example app that can load both JSON and JavaScript files from command line
+ * E.g.   scripting.example my-first.js  my-first.json
+ * See dali-demo/resources/scripts for example JSON and JavaScript files
+ */
+class Launcher: public Dali::ConnectionTracker
+{
+public:
+
+  /**
+   * @brief Construcctor
+   * @param application application
+   * @param layoutFileName JSON file to run
+   * @param scriptFileName JavaScript file to run
+   */
+  Launcher( Dali::Application application, std::string layoutFileName, std::string scriptFileName );
+
+  /**
+   * @brief destructor
+   */
+  ~Launcher();
+
+  /**
+   * @brief create app
+   */
+  void Create( Dali::Application& application );
+
+  /**
+   * @brief run application MainLoop
+   */
+  void MainLoop();
+
+private:
+
+  Dali::Toolkit::Script mScript;      ///< Used to load and execute JavaScript
+  Dali::Toolkit::Builder mBuilder;    ///< Used to parse JSON
+  Dali::Application mApplication;     ///< application
+  std::string mJSONFileName;          ///< JSON filename
+  std::string mJavaScriptFileName;    ///< JavaScript filename
+};
+
+#endif // header
@@ -15,74 +15,82 @@
  *
  */
-// CLASS HEADER
-#include "edit-layout.h"
+// EXTERNAL INCLUDES
+#include <string>
+#include <stdio.h>
+#include <sys/stat.h>
+#include <dali/integration-api/debug.h>
 // INTERNAL INCLUDES
-#include "edit-layout-impl.h"
+#include "launcher.h"
-namespace Dali
+namespace
 {
-
-namespace Toolkit
-{
-
-EditLayout EditLayout::New()
-{
-  return Internal::EditLayout::New();
-}
-
-void EditLayout::SetTopPanel( Control panel )
+bool CheckIfFileExists( const std::string& filename )
 {
-  GetImpl( *this ).SetTopPanel( panel );
+  struct stat buf;
+  // fstat returns -1 on error
+  if (stat( filename.c_str(), &buf) != -1)
+  {
+      return true;
+  }
+  return false;
 }
-EditLayout::EditLayout()
-{
 }
-
-EditLayout::EditLayout( const EditLayout& handle )
-: Control( handle )
+int main( int argc, char* argv[] )
 {
-}
+  // pull out the JSON file and JavaScript file from the command line arguments
+  std::string javaScriptFileName;
+  std::string jSONFileName;
-EditLayout& EditLayout::operator=( const EditLayout& handle )
-{
-  if( &handle != this )
+  for( int i = 1 ; i < argc ; ++i )
   {
-    Control::operator=( handle );
+    std::string arg( argv[i] );
+
+    size_t idx = std::string::npos;
+
+    idx = arg.find( ".json" );
+    if( idx != std::string::npos )
+    {
+      jSONFileName = arg;
+    }
+    else
+    {
+      idx = arg.find( ".js" );
+      if( idx != std::string::npos )
+      {
+        javaScriptFileName = arg;
+      }
+    }
   }
-  return *this;
-}
-
-EditLayout EditLayout::DownCast( BaseHandle handle )
-{
-  return Control::DownCast<EditLayout, Internal::EditLayout>( handle );
-}
-EditLayout::~EditLayout()
-{
-}
-
-EditLayout::EditLayout( Internal::EditLayout& internal )
-: Control( internal )
-{
-}
+  if( !jSONFileName.empty() )
+  {
+    bool exists = CheckIfFileExists( jSONFileName );
+    if( !exists )
+    {
+      DALI_ASSERT_ALWAYS( 0 && "JSON file not found ")
+    }
+  }
+  if( !javaScriptFileName.empty() )
+  {
+    bool exists = CheckIfFileExists( javaScriptFileName );
+    if( !exists )
+    {
+        DALI_ASSERT_ALWAYS( 0 && "JavaScript file not found ")
+    }
+  }
+  if( jSONFileName.empty() && javaScriptFileName.empty() )
+  {
+    printf("Please specify a JSON and/or JavaScript file to load, e.g. scripting.example mylayout.json my-test.js\n");
+    return -1;
+  }
-EditLayout::EditLayout( Dali::Internal::CustomActor* internal )
-: Control( internal )
-{
-}
-Internal::EditLayout& EditLayout::GetImpl( EditLayout& verticalLayout )
-{
-  DALI_ASSERT_ALWAYS( verticalLayout );
+  Launcher daliApplication( Dali::Application::New( &argc, &argv ), jSONFileName, javaScriptFileName );
-  Dali::RefObject& handle = verticalLayout.GetImplementation();
+  daliApplication.MainLoop();
-  return static_cast<Internal::EditLayout&>(handle);
+  return 0;
 }
-
-} // namespace Toolkit
-
-} // namespace Dali
@@ -226,6 +226,7 @@ private:
     Vector2 stageSize = stage.GetSize();
     mScrollView = ScrollView::New();
+    mScrollView.SetRelayoutEnabled( false );
     mScrollView.SetAnchorPoint(AnchorPoint::CENTER);
     mScrollView.SetParentOrigin(ParentOrigin::CENTER);
     mContentLayer.Add( mScrollView );
@@ -298,7 +299,8 @@ private:
   Actor CreatePage()
   {
     Actor page = Actor::New();
-    page.SetSizeMode( SIZE_EQUAL_TO_PARENT );
+    page.SetRelayoutEnabled( true );
+    page.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
     page.SetParentOrigin( ParentOrigin::CENTER );
     page.SetAnchorPoint( AnchorPoint::CENTER );
@@ -450,7 +452,8 @@ private:
    void ApplyEffectToPage(Actor page)
    {
      page.RemoveConstraints();
-     page.SetSizeMode( SIZE_EQUAL_TO_PARENT );
+     page.SetRelayoutEnabled( true );
+     page.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
      switch( mEffectMode )
      {
@@ -566,6 +569,7 @@ private:
     attributes.SetFilterMode( ImageAttributes::BoxThenLinear );
     Image img = ResourceImage::New(filename, attributes);
     ImageActor actor = ImageActor::New(img);
+    actor.SetRelayoutEnabled( false );
     actor.SetName( filename );
     actor.SetParentOrigin(ParentOrigin::CENTER);
     actor.SetAnchorPoint(AnchorPoint::CENTER);
@@ -207,7 +207,8 @@ public:
     mShadowView.SetName("Container");
     mShadowView.SetParentOrigin(ParentOrigin::CENTER);
     mShadowView.SetAnchorPoint(AnchorPoint::CENTER);
-    mShadowView.SetSizeMode( SIZE_EQUAL_TO_PARENT );
+    mShadowView.SetRelayoutEnabled( true );
+    mShadowView.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
     mShadowView.SetPointLightFieldOfView( Math::PI / 2.0f);
     mContents.Add(mShadowView);
+/*
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include "shared/view.h"
+#include <dali/dali.h>
+#include <dali-toolkit/dali-toolkit.h>
+
+using namespace Dali;
+
+// Define this so that it is interchangeable
+// "DP" stands for Device independent Pixels
+#define DP(x) DemoHelper::ScalePointSize(x)
+
+struct ButtonItem
+{
+  const char* name;
+  const char* text;
+};
+
+
+namespace
+{
+
+const char* const BACKGROUND_IMAGE = DALI_IMAGE_DIR "background-gradient.jpg";
+const char* const TOOLBAR_IMAGE = DALI_IMAGE_DIR "top-bar.png";
+
+const char* const TOOLBAR_TITLE = "Size Negotiation";
+const int TOOLBAR_HEIGHT = 62;
+
+const char* MENU_ICON_IMAGE = DALI_IMAGE_DIR "icon-cluster-none.png";
+
+const char* const PUSHBUTTON_BUTTON_IMAGE = DALI_IMAGE_DIR "button-up.9.png";
+const char* const PUSHBUTTON_PRESS_IMAGE = DALI_IMAGE_DIR "button-down.9.png";
+
+const char* const POPUPS_MENU_ID = "POPUPS_MENU";
+const char* const TABLEVIEW_MENU_ID = "TABLEVIEW_MENU";
+
+const char* const POPUP_BUTTON_EMPTY_ID = "POPUP_BUTTON_EMPTY";
+const char* const POPUP_BUTTON_TITLE_ID = "POPUP_BUTTON_TITLE";
+const char* const POPUP_BUTTON_BUTTONS_1_ID = "POPUP_BUTTON_BUTTONS_1";
+const char* const POPUP_BUTTON_BUTTONS_2_ID = "POPUP_BUTTON_BUTTONS_2";
+const char* const POPUP_BUTTON_TITLE_BUTTONS_ID = "POPUP_BUTTON_TITLE_BUTTONS";
+const char* const POPUP_BUTTON_CONTENT_TEXT_ID = "POPUP_BUTTON_CONTENT_TEXT";
+const char* const POPUP_BUTTON_CONTENT_IMAGE_ID = "POPUP_BUTTON_CONTENT_IMAGE";
+const char* const POPUP_BUTTON_CONTENT_IMAGE_SCALE_ID = "POPUP_BUTTON_CONTENT_IMAGE_SCALE";
+const char* const POPUP_BUTTON_CONTENT_IMAGE_FIT_ID = "POPUP_BUTTON_CONTENT_IMAGE_FIT";
+const char* const POPUP_BUTTON_CONTENT_IMAGE_FILL_ID = "POPUP_BUTTON_CONTENT_IMAGE_FILL";
+const char* const POPUP_BUTTON_TITLE_CONTENT_TEXT_ID = "POPUP_BUTTON_TITLE_CONTENT_TEXT";
+const char* const POPUP_BUTTON_TITLE_CONTENT_TEXT_BUTTONS_ID = "POPUP_BUTTON_TITLE_CONTENT_TEXT_BUTTONS";
+const char* const POPUP_BUTTON_COMPLEX_ID = "POPUP_BUTTON_COMPLEX";
+
+const char* const TABLEVIEW_BUTTON_EMPTY_ID = "TABLEVIEW_BUTTON_EMPTY";
+const char* const TABLEVIEW_BUTTON_1CELL_ID = "TABLEVIEW_BUTTON_1CELL";
+const char* const TABLEVIEW_BUTTON_3CELL_ID = "TABLEVIEW_BUTTON_3CELL";
+const char* const TABLEVIEW_BUTTON_3X3CELL_ID = "TABLEVIEW_BUTTON_3X3CELL";
+const char* const TABLEVIEW_BUTTON_FIXED1_ID = "TABLEVIEW_BUTTON_FIXED1";
+const char* const TABLEVIEW_BUTTON_FIXED2_ID = "TABLEVIEW_BUTTON_FIXED2";
+const char* const TABLEVIEW_BUTTON_FIT1_ID = "TABLEVIEW_BUTTON_FIT1";
+const char* const TABLEVIEW_BUTTON_FIT2_ID = "TABLEVIEW_BUTTON_FIT2";
+const char* const TABLEVIEW_BUTTON_NATURAL1_ID = "TABLEVIEW_BUTTON_NATURAL1";
+const char* const TABLEVIEW_BUTTON_NATURAL2_ID = "TABLEVIEW_BUTTON_NATURAL2";
+const char* const TABLEVIEW_BUTTON_NATURAL3_ID = "TABLEVIEW_BUTTON_NATURAL3";
+
+const char* const OKAY_BUTTON_ID = "OKAY_BUTTON";
+const char* const CANCEL_BUTTON_ID = "CANCEL_BUTTON";
+
+const char* const CONTENT_TEXT = "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.";
+const char* const IMAGE1 = DALI_IMAGE_DIR "gallery-medium-5.jpg";
+const char* const IMAGE2 = DALI_IMAGE_DIR "background-magnifier.jpg";
+const char* const CHECKBOX_UNCHECKED_IMAGE = DALI_IMAGE_DIR "checkbox-unselected.png";
+const char* const CHECKBOX_CHECKED_IMAGE = DALI_IMAGE_DIR "checkbox-selected.png";
+
+const ButtonItem MENU_ITEMS[] = {
+    { POPUPS_MENU_ID,        "Popups" },
+    { TABLEVIEW_MENU_ID,     "TableView" }
+};
+
+const unsigned int MENU_ITEMS_COUNT = sizeof( MENU_ITEMS ) / sizeof( MENU_ITEMS[0] );
+
+const ButtonItem POPUP_BUTTON_ITEMS[] = {
+    { POPUP_BUTTON_COMPLEX_ID,                    "Complex" },
+    { POPUP_BUTTON_EMPTY_ID,                      "Empty" },
+    { POPUP_BUTTON_TITLE_ID,                      "Title" },
+    { POPUP_BUTTON_BUTTONS_1_ID,                  "1 Button" },
+    { POPUP_BUTTON_BUTTONS_2_ID,                  "2 Buttons" },
+    { POPUP_BUTTON_TITLE_BUTTONS_ID,              "Title & Buttons" },
+    { POPUP_BUTTON_CONTENT_TEXT_ID,               "Text" },
+    { POPUP_BUTTON_CONTENT_IMAGE_ID,              "Image" },
+    { POPUP_BUTTON_CONTENT_IMAGE_SCALE_ID,        "Image Scale" },
+    { POPUP_BUTTON_CONTENT_IMAGE_FIT_ID,          "Image Fit" },
+    { POPUP_BUTTON_CONTENT_IMAGE_FILL_ID,         "Image Fill" },
+    { POPUP_BUTTON_TITLE_CONTENT_TEXT_ID,         "Title Text" },
+    { POPUP_BUTTON_TITLE_CONTENT_TEXT_BUTTONS_ID, "Title, text, buttons" }
+
+};
+
+const int POPUP_BUTTON_ITEMS_COUNT = sizeof( POPUP_BUTTON_ITEMS ) / sizeof( POPUP_BUTTON_ITEMS[0] );
+
+const ButtonItem TABLEVIEW_BUTTON_ITEMS[] = {
+    { TABLEVIEW_BUTTON_EMPTY_ID,                    "Empty" },
+    { TABLEVIEW_BUTTON_1CELL_ID,                    "1 Cell" },
+    { TABLEVIEW_BUTTON_3CELL_ID,                    "3 Cell" },
+    { TABLEVIEW_BUTTON_3X3CELL_ID,                  "3x3 Cells" },
+    { TABLEVIEW_BUTTON_FIXED1_ID,                   "Fixed 1" },
+    { TABLEVIEW_BUTTON_FIXED2_ID,                   "Fixed 2" },
+    { TABLEVIEW_BUTTON_FIT1_ID,                     "Fit Top Bottom" },
+    { TABLEVIEW_BUTTON_FIT2_ID,                     "Fit Middle" },
+    { TABLEVIEW_BUTTON_NATURAL1_ID,                 "Natural 1" },
+    { TABLEVIEW_BUTTON_NATURAL2_ID,                 "Natural 2" },
+    { TABLEVIEW_BUTTON_NATURAL3_ID,                 "Natural 3" },
+};
+
+const unsigned int TABLEVIEW_BUTTON_ITEMS_COUNT = sizeof( TABLEVIEW_BUTTON_ITEMS ) / sizeof( TABLEVIEW_BUTTON_ITEMS[0] );
+
+}  // namespace
+
+
+
+/**
+ * This example shows the usage of size negotiation.
+ */
+class SizeNegotiationController: public ConnectionTracker, public Toolkit::ItemFactory
+{
+public:
+
+  SizeNegotiationController( Application& application )
+    : mApplication( application ),
+      mMenuShown( false ),
+      mDemoState( POPUP )
+  {
+    // Connect to the Application's Init signal
+    mApplication.InitSignal().Connect( this, &SizeNegotiationController::Create );
+  }
+
+  ~SizeNegotiationController()
+  {
+    // Nothing to do here
+  }
+
+  void Create( Application& application )
+  {
+    // The Init signal is received once (only) during the Application lifetime
+
+    Stage stage = Stage::GetCurrent();
+
+    // Respond to key events
+    stage.KeyEventSignal().Connect(this, &SizeNegotiationController::OnKeyEvent);
+
+    // Creates a default view with a default tool bar.
+    // The view is added to the stage.
+    mContentLayer = DemoHelper::CreateView( application,
+                                            mView,
+                                            mToolBar,
+                                            BACKGROUND_IMAGE,
+                                            TOOLBAR_IMAGE,
+                                            std::string("") );
+
+    mTitleActor = Dali::Toolkit::TextLabel::New(); // FIXME
+    mTitleActor.SetName( "CUSTOM_TOOLBAR_TITLE" );
+
+    SetTitle();
+
+    // Create menu button
+    Toolkit::PushButton viewButton = Toolkit::PushButton::New();
+    viewButton.SetBackgroundImage( ResourceImage::New( MENU_ICON_IMAGE ) );
+    viewButton.ClickedSignal().Connect( this, &SizeNegotiationController::OnMenu );
+    mToolBar.AddControl( viewButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalLeft, DemoHelper::DEFAULT_MODE_SWITCH_PADDING  );
+
+    // Add title to the tool bar.
+    const float padding( DemoHelper::DEFAULT_VIEW_STYLE.mToolBarPadding );
+    mToolBar.AddControl( mTitleActor, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarTitlePercentage, Toolkit::Alignment::HorizontalCenter, Toolkit::Alignment::Padding( padding, padding, padding, padding ) );
+
+    mItemView = Toolkit::ItemView::New( *this );
+    mItemView.SetParentOrigin( ParentOrigin::CENTER );
+    mItemView.SetAnchorPoint( AnchorPoint::CENTER );
+    mItemView.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
+
+    // Use a grid layout for tests
+    Toolkit::GridLayoutPtr gridLayout = Toolkit::GridLayout::New();
+    gridLayout->SetNumberOfColumns( 2 );
+    gridLayout->SetTopMargin( DP(TOOLBAR_HEIGHT) + DP(20.0f) );
+    gridLayout->SetBottomMargin( DP(100.0f) );
+    gridLayout->SetRowSpacing( DP(20.0f) );
+    mItemView.AddLayout( *gridLayout );
+
+    Vector2 stageSize = stage.GetSize();
+    float layoutWidth = Toolkit::IsHorizontal( gridLayout->GetOrientation() ) ? stageSize.height : stageSize.width;
+    float gridItemSize = ( layoutWidth / gridLayout->GetNumberOfColumns() ) * 0.5f;
+    gridLayout->SetScrollSpeedFactor( gridLayout->GetNumberOfColumns() / gridItemSize * 0.5f );
+
+    mItemView.ActivateLayout( 0, Vector3(stageSize.x, stageSize.y, stageSize.x), 0.0f );
+
+    mContentLayer.Add( mItemView );
+  }
+
+  void SetTitle()
+  {
+    std::string subTitle = "";
+
+    switch( mDemoState )
+    {
+      case POPUP:
+      {
+        subTitle = "Popups";
+        break;
+      }
+
+      case TABLEVIEW:
+      {
+        subTitle = "TableView";
+        break;
+      }
+
+      default:
+      {
+        break;
+      }
+    }
+
+    mTitleActor.SetProperty( Toolkit::TextLabel::Property::TEXT, std::string( std::string( TOOLBAR_TITLE ) + ": " + subTitle ) );
+  }
+
+  bool OnMenu( Toolkit::Button button )
+  {
+    ShowMenu();
+    return true;
+  }
+
+  void ShowMenu()
+  {
+    Stage stage = Stage::GetCurrent();
+    const float popupWidth = stage.GetSize().x * 0.5f;
+
+    mMenu = Toolkit::Popup::New();
+    mMenu.SetParentOrigin( ParentOrigin::TOP_LEFT );
+    mMenu.SetAnchorPoint( AnchorPoint::TOP_LEFT );
+    mMenu.HideTail();
+    mMenu.OutsideTouchedSignal().Connect( this, &SizeNegotiationController::HideMenu );
+    mMenu.SetPreferredSize( Vector2( popupWidth, 0.0f ) );
+    mMenu.SetResizePolicy( FIT_TO_CHILDREN, HEIGHT );
+
+    Toolkit::TableView tableView = Toolkit::TableView::New( 0, 0 );
+    tableView.SetResizePolicy( FILL_TO_PARENT, WIDTH );
+    tableView.SetResizePolicy( USE_NATURAL_SIZE, HEIGHT );
+    mMenu.Add( tableView );
+
+    for( unsigned int i = 0; i < MENU_ITEMS_COUNT; ++i )
+    {
+      Toolkit::PushButton menuButton = Toolkit::PushButton::New();
+      menuButton.SetName( MENU_ITEMS[ i ].name );
+      menuButton.SetLabel( MENU_ITEMS[ i ].text );
+      menuButton.ClickedSignal().Connect( this, &SizeNegotiationController::OnMenuSelect );
+
+      tableView.Add( menuButton );
+      tableView.SetFitHeight( i );
+    }
+
+    // Show the menu
+    mMenu.Show();
+    mMenuShown = true;
+  }
+
+  void HideMenu()
+  {
+    if( mMenu )
+    {
+      mMenu.Hide();
+      mMenu.Reset();
+    }
+
+    mMenuShown = false;
+  }
+
+  bool OnMenuSelect( Toolkit::Button button )
+  {
+    bool refresh = false;
+
+    if( button.GetName() == POPUPS_MENU_ID )
+    {
+      if( mDemoState != POPUP )
+      {
+        refresh = true;
+        mDemoState = POPUP;
+      }
+    }
+    else if( button.GetName() == TABLEVIEW_MENU_ID )
+    {
+      if( mDemoState != TABLEVIEW )
+      {
+        refresh = true;
+        mDemoState = TABLEVIEW;
+      }
+    }
+
+    if( refresh )
+    {
+      SetTitle();
+
+      mItemView.Refresh();
+    }
+
+    HideMenu();
+    return true;
+  }
+
+  Toolkit::Popup CreatePopup()
+  {
+    Stage stage = Stage::GetCurrent();
+    const float POPUP_WIDTH_DP = stage.GetSize().width * 0.75f;
+
+    Toolkit::Popup popup = Toolkit::Popup::New();
+    popup.SetName( "POPUP" );
+    popup.SetParentOrigin( ParentOrigin::CENTER );
+    popup.SetAnchorPoint( AnchorPoint::CENTER );
+    popup.SetPreferredSize( Vector2( POPUP_WIDTH_DP, 0.0f ) );
+    popup.HideTail();
+
+    popup.OutsideTouchedSignal().Connect( this, &SizeNegotiationController::OnPopupOutsideTouched );
+
+    return popup;
+  }
+
+  bool OnButtonClicked( Toolkit::Button button )
+  {
+    if( button.GetName() == POPUP_BUTTON_EMPTY_ID )
+    {
+      mPopup = CreatePopup();
+
+      // The popup is not yet on the stage so needs to be flaged as dirty
+      mPopup.MarkDirtyForRelayout();
+
+      mPopup.Show();
+    }
+    else if( button.GetName() == POPUP_BUTTON_TITLE_ID )
+    {
+      mPopup = CreatePopup();
+      mPopup.SetTitle( "Popup!" );
+
+      // The popup is not yet on the stage so needs to be flaged as dirty
+      mPopup.MarkDirtyForRelayout();
+
+      mPopup.Show();
+    }
+    else if( button.GetName() == POPUP_BUTTON_BUTTONS_1_ID )
+    {
+      mPopup = CreatePopup();
+
+      Toolkit::PushButton okayButton = Toolkit::PushButton::New();
+      okayButton.SetName( OKAY_BUTTON_ID );
+      okayButton.SetLabel( "OK!" );
+      okayButton.SetSelectedImage( Dali::ResourceImage::New( PUSHBUTTON_PRESS_IMAGE ) );
+      okayButton.SetButtonImage( Dali::ResourceImage::New( PUSHBUTTON_BUTTON_IMAGE ) );
+
+      okayButton.ClickedSignal().Connect( this, &SizeNegotiationController::OnButtonClicked );
+
+      mPopup.AddButton( okayButton );
+
+      // The popup is not yet on the stage so needs to be flaged as dirty
+      mPopup.MarkDirtyForRelayout();
+
+      mPopup.Show();
+    }
+    else if( button.GetName() == POPUP_BUTTON_BUTTONS_2_ID )
+    {
+      mPopup = CreatePopup();
+
+      Toolkit::PushButton cancelButton = Toolkit::PushButton::New();
+      cancelButton.SetName( CANCEL_BUTTON_ID );
+      cancelButton.SetLabel( "Cancel" );
+      cancelButton.SetSelectedImage( Dali::ResourceImage::New( PUSHBUTTON_PRESS_IMAGE ) );
+      cancelButton.SetButtonImage( Dali::ResourceImage::New( PUSHBUTTON_BUTTON_IMAGE ) );
+
+      cancelButton.ClickedSignal().Connect( this, &SizeNegotiationController::OnButtonClicked );
+
+      mPopup.AddButton( cancelButton );
+
+      Toolkit::PushButton okayButton = Toolkit::PushButton::New();
+      okayButton.SetName( OKAY_BUTTON_ID );
+      okayButton.SetLabel( "OK!" );
+      okayButton.SetSelectedImage( Dali::ResourceImage::New( PUSHBUTTON_PRESS_IMAGE ) );
+      okayButton.SetButtonImage( Dali::ResourceImage::New( PUSHBUTTON_BUTTON_IMAGE ) );
+
+      okayButton.ClickedSignal().Connect( this, &SizeNegotiationController::OnButtonClicked );
+
+      mPopup.AddButton( okayButton );
+
+      // The popup is not yet on the stage so needs to be flaged as dirty
+      mPopup.MarkDirtyForRelayout();
+
+      mPopup.Show();
+    }
+    else if( button.GetName() == POPUP_BUTTON_TITLE_BUTTONS_ID )
+    {
+      mPopup = CreatePopup();
+      mPopup.SetTitle( "Popup!" );
+
+      Toolkit::PushButton cancelButton = Toolkit::PushButton::New();
+      cancelButton.SetName( CANCEL_BUTTON_ID );
+      cancelButton.SetLabel( "Cancel" );
+      cancelButton.SetSelectedImage( Dali::ResourceImage::New( PUSHBUTTON_PRESS_IMAGE ) );
+      cancelButton.SetButtonImage( Dali::ResourceImage::New( PUSHBUTTON_BUTTON_IMAGE ) );
+
+      cancelButton.ClickedSignal().Connect( this, &SizeNegotiationController::OnButtonClicked );
+
+      mPopup.AddButton( cancelButton );
+
+      Toolkit::PushButton okayButton = Toolkit::PushButton::New();
+      okayButton.SetName( OKAY_BUTTON_ID );
+      okayButton.SetLabel( "OK!" );
+      okayButton.SetSelectedImage( Dali::ResourceImage::New( PUSHBUTTON_PRESS_IMAGE ) );
+      okayButton.SetButtonImage( Dali::ResourceImage::New( PUSHBUTTON_BUTTON_IMAGE ) );
+
+      okayButton.ClickedSignal().Connect( this, &SizeNegotiationController::OnButtonClicked );
+
+      mPopup.AddButton( okayButton );
+
+      // The popup is not yet on the stage so needs to be flaged as dirty
+      mPopup.MarkDirtyForRelayout();
+
+      mPopup.Show();
+    }
+    else if( button.GetName() == POPUP_BUTTON_CONTENT_TEXT_ID )
+    {
+      mPopup = CreatePopup();
+
+      // FIXME - Add text
+
+      // The popup is not yet on the stage so needs to be flaged as dirty
+      mPopup.MarkDirtyForRelayout();
+
+      mPopup.Show();
+    }
+    else if( button.GetName() == POPUP_BUTTON_CONTENT_IMAGE_ID )
+    {
+      mPopup = CreatePopup();
+
+      ImageActor image = ImageActor::New( ResourceImage::New( IMAGE2 ) );
+      image.SetResizePolicy( FILL_TO_PARENT, WIDTH );
+      image.SetDimensionDependency( HEIGHT, WIDTH );
+      image.SetPadding( Padding( 20.0f, 20.0f, 20.0f, 20.0f ) );
+
+      mPopup.Add( image );
+
+      // The popup is not yet on the stage so needs to be flaged as dirty
+      mPopup.MarkDirtyForRelayout();
+
+      mPopup.Show();
+    }
+    else if( button.GetName() == POPUP_BUTTON_CONTENT_IMAGE_SCALE_ID )
+    {
+      mPopup = CreatePopup();
+
+      mPopup.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
+      mPopup.SetSizeMode( SIZE_RELATIVE_TO_PARENT );
+      mPopup.SetSizeModeFactor( Vector3( 0.75f, 0.5f, 1.0f ) );
+
+      ImageActor image = ImageActor::New( ResourceImage::New( IMAGE2 ) );
+      image.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
+
+      mPopup.Add( image );
+
+      // The popup is not yet on the stage so needs to be flaged as dirty
+      mPopup.MarkDirtyForRelayout();
+
+      mPopup.Show();
+    }
+    else if( button.GetName() == POPUP_BUTTON_CONTENT_IMAGE_FIT_ID )
+    {
+      mPopup = CreatePopup();
+
+      mPopup.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
+      mPopup.SetSizeMode( SIZE_RELATIVE_TO_PARENT );
+      mPopup.SetSizeModeFactor( Vector3( 0.75f, 0.5f, 1.0f ) );
+
+      ImageActor image = ImageActor::New( ResourceImage::New( IMAGE2 ) );
+      image.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
+      image.SetSizeScalePolicy( FIT_WITH_ASPECT_RATIO );
+
+      mPopup.Add( image );
+
+      // The popup is not yet on the stage so needs to be flaged as dirty
+      mPopup.MarkDirtyForRelayout();
+
+      mPopup.Show();
+    }
+    else if( button.GetName() == POPUP_BUTTON_CONTENT_IMAGE_FILL_ID )
+    {
+      mPopup = CreatePopup();
+
+      mPopup.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
+      mPopup.SetSizeMode( SIZE_RELATIVE_TO_PARENT );
+      mPopup.SetSizeModeFactor( Vector3( 0.75f, 0.5f, 1.0f ) );
+
+      ImageActor image = ImageActor::New( ResourceImage::New( IMAGE2 ) );
+      image.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
+      image.SetSizeScalePolicy( FILL_WITH_ASPECT_RATIO );
+
+      mPopup.Add( image );
+
+      // The popup is not yet on the stage so needs to be flaged as dirty
+      mPopup.MarkDirtyForRelayout();
+
+      mPopup.Show();
+    }
+    else if( button.GetName() == POPUP_BUTTON_TITLE_CONTENT_TEXT_ID )
+    {
+      mPopup = CreatePopup();
+      mPopup.SetTitle( "Popup!" );
+
+      // FIXME - Add text
+
+      // The popup is not yet on the stage so needs to be flaged as dirty
+      mPopup.MarkDirtyForRelayout();
+
+      mPopup.Show();
+    }
+    else if( button.GetName() == POPUP_BUTTON_TITLE_CONTENT_TEXT_BUTTONS_ID )
+    {
+      mPopup = CreatePopup();
+      mPopup.SetTitle( "Popup!" );
+
+      // FIXME - Add text
+
+      Toolkit::PushButton cancelButton = Toolkit::PushButton::New();
+      cancelButton.SetName( CANCEL_BUTTON_ID );
+      cancelButton.SetLabel( "Cancel" );
+      cancelButton.SetSelectedImage( Dali::ResourceImage::New( PUSHBUTTON_PRESS_IMAGE ) );
+      cancelButton.SetButtonImage( Dali::ResourceImage::New( PUSHBUTTON_BUTTON_IMAGE ) );
+
+      cancelButton.ClickedSignal().Connect( this, &SizeNegotiationController::OnButtonClicked );
+
+      mPopup.AddButton( cancelButton );
+
+      Toolkit::PushButton okayButton = Toolkit::PushButton::New();
+      okayButton.SetName( OKAY_BUTTON_ID );
+      okayButton.SetLabel( "OK!" );
+      okayButton.SetSelectedImage( Dali::ResourceImage::New( PUSHBUTTON_PRESS_IMAGE ) );
+      okayButton.SetButtonImage( Dali::ResourceImage::New( PUSHBUTTON_BUTTON_IMAGE ) );
+
+      okayButton.ClickedSignal().Connect( this, &SizeNegotiationController::OnButtonClicked );
+
+      mPopup.AddButton( okayButton );
+
+      // The popup is not yet on the stage so needs to be flaged as dirty
+      mPopup.MarkDirtyForRelayout();
+
+      mPopup.Show();
+    }
+    else if( button.GetName() == POPUP_BUTTON_COMPLEX_ID )
+    {
+      mPopup = CreatePopup();
+      mPopup.SetTitle( "Warning" );
+
+      // Content
+      Toolkit::TableView content = Toolkit::TableView::New( 2, 2 );
+      content.SetName( "COMPLEX_TABLEVIEW" );
+      content.SetResizePolicy( FILL_TO_PARENT, WIDTH );
+      content.SetResizePolicy( USE_NATURAL_SIZE, HEIGHT );
+      content.SetFitHeight( 0 );
+      content.SetFitHeight( 1 );
+      content.SetPadding( Padding( 20.0f, 20.0f, 20.0f, 0.0f ) );
+
+      // Text
+      {
+        Toolkit::TextLabel text = Toolkit::TextLabel::New();
+        // FIXME
+
+        content.AddChild( text, Toolkit::TableView::CellPosition( 0, 0 ) );
+      }
+
+      // Image
+      {
+        ImageActor image = ImageActor::New( ResourceImage::New( IMAGE1 ) );
+        image.SetName( "COMPLEX_IMAGE" );
+        image.SetResizePolicy( FILL_TO_PARENT, WIDTH );
+        image.SetDimensionDependency( HEIGHT, WIDTH );
+        image.SetPadding( Padding( 20.0f, 0.0f, 0.0f, 0.0f ) );
+        content.AddChild( image, Toolkit::TableView::CellPosition( 0, 1 ) );
+      }
+
+      // Text 2
+      {
+        Toolkit::TableView root = Toolkit::TableView::New( 1, 2 );
+        root.SetResizePolicy( FILL_TO_PARENT, WIDTH );
+        root.SetResizePolicy( USE_NATURAL_SIZE, HEIGHT );
+        root.SetFitHeight( 0 );
+        root.SetFitWidth( 0 );
+        root.SetPadding( Padding( 0.0f, 0.0f, 0.0f, 20.0f ) );
+
+        Dali::Image unchecked = Dali::ResourceImage::New( CHECKBOX_UNCHECKED_IMAGE );
+        Dali::Image checked = Dali::ResourceImage::New( CHECKBOX_CHECKED_IMAGE );
+        Toolkit::CheckBoxButton checkBox = Toolkit::CheckBoxButton::New();
+        checkBox.SetBackgroundImage( unchecked );
+        checkBox.SetSelectedImage( checked );
+        checkBox.SetPreferredSize( Vector2( 48, 48 ) );
+        checkBox.SetResizePolicy( FIXED, ALL_DIMENSIONS );
+
+        root.AddChild( checkBox, Toolkit::TableView::CellPosition( 0, 0 ) );
+
+        Toolkit::TextLabel text = Toolkit::TextLabel::New( "Don't show again" );
+        // FIXME
+        Actor textActor = text;
+        textActor.SetPadding( Padding( 20.0f, 0.0f, 0.0f, 10.0f ) );
+
+        root.AddChild( text, Toolkit::TableView::CellPosition( 0, 1 ) );
+
+        content.AddChild( root, Toolkit::TableView::CellPosition( 1, 0, 0, 2 ) );  // Column span 2
+      }
+
+      mPopup.Add( content );
+
+      // Buttons
+      Toolkit::PushButton cancelButton = Toolkit::PushButton::New();
+      cancelButton.SetName( CANCEL_BUTTON_ID );
+      cancelButton.SetLabel( "Cancel" );
+      cancelButton.SetSelectedImage( Dali::ResourceImage::New( PUSHBUTTON_PRESS_IMAGE ) );
+      cancelButton.SetButtonImage( Dali::ResourceImage::New( PUSHBUTTON_BUTTON_IMAGE ) );
+
+      cancelButton.ClickedSignal().Connect( this, &SizeNegotiationController::OnButtonClicked );
+
+      mPopup.AddButton( cancelButton );
+
+      Toolkit::PushButton okayButton = Toolkit::PushButton::New();
+      okayButton.SetName( OKAY_BUTTON_ID );
+      okayButton.SetLabel( "OK!" );
+      okayButton.SetSelectedImage( Dali::ResourceImage::New( PUSHBUTTON_PRESS_IMAGE ) );
+      okayButton.SetButtonImage( Dali::ResourceImage::New( PUSHBUTTON_BUTTON_IMAGE ) );
+
+      okayButton.ClickedSignal().Connect( this, &SizeNegotiationController::OnButtonClicked );
+
+      mPopup.AddButton( okayButton );
+
+      // The popup is not yet on the stage so needs to be flaged as dirty
+      mPopup.MarkDirtyForRelayout();
+
+      mPopup.Show();
+    }
+    else if( button.GetName() == TABLEVIEW_BUTTON_EMPTY_ID )
+    {
+      mPopup = CreatePopup();
+      mPopup.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
+      mPopup.SetSizeMode( SIZE_RELATIVE_TO_PARENT );
+      mPopup.SetSizeModeFactor( Vector3( 0.75f, 0.5f, 1.0f ) );
+
+
+      Toolkit::TableView table = Toolkit::TableView::New( 0, 0 );
+      table.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
+
+      mPopup.Add( table );
+
+      // The popup is not yet on the stage so needs to be flaged as dirty
+      mPopup.MarkDirtyForRelayout();
+
+      mPopup.Show();
+    }
+    else if( button.GetName() == TABLEVIEW_BUTTON_1CELL_ID )
+    {
+      mPopup = CreatePopup();
+      mPopup.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
+      mPopup.SetSizeMode( SIZE_RELATIVE_TO_PARENT );
+      mPopup.SetSizeModeFactor( Vector3( 0.75f, 0.5f, 1.0f ) );
+
+
+      Toolkit::TableView table = Toolkit::TableView::New( 0, 0 );
+      table.SetName( "TABLEVIEW_BUTTON_1CELL_ID" );
+      table.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
+
+      Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 0.0f, 0.0f, 1.0f ) );
+      backing.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
+      table.Add( backing );
+
+      mPopup.Add( table );
+
+      // The popup is not yet on the stage so needs to be flaged as dirty
+      mPopup.MarkDirtyForRelayout();
+
+      mPopup.Show();
+    }
+    else if( button.GetName() == TABLEVIEW_BUTTON_3CELL_ID )
+    {
+      mPopup = CreatePopup();
+      mPopup.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
+      mPopup.SetSizeMode( SIZE_RELATIVE_TO_PARENT );
+      mPopup.SetSizeModeFactor( Vector3( 0.75f, 0.5f, 1.0f ) );
+
+
+      Toolkit::TableView table = Toolkit::TableView::New( 0, 0 );
+      table.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
+
+      {
+        Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 0.0f, 0.0f, 1.0f ) );
+        backing.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
+        table.Add( backing );
+      }
+      {
+        Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 1.0f, 0.0f, 1.0f ) );
+        backing.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
+        table.Add( backing );
+      }
+      {
+        Actor backing = Toolkit::CreateSolidColorActor( Vector4( 0.0f, 1.0f, 0.0f, 1.0f ) );
+        backing.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
+        table.Add( backing );
+      }
+
+      mPopup.Add( table );
+
+      // The popup is not yet on the stage so needs to be flaged as dirty
+      mPopup.MarkDirtyForRelayout();
+
+      mPopup.Show();
+    }
+    else if( button.GetName() == TABLEVIEW_BUTTON_3X3CELL_ID )
+    {
+      mPopup = CreatePopup();
+      mPopup.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
+      mPopup.SetSizeMode( SIZE_RELATIVE_TO_PARENT );
+      mPopup.SetSizeModeFactor( Vector3( 0.75f, 0.5f, 1.0f ) );
+
+
+      Toolkit::TableView table = Toolkit::TableView::New( 3, 3 );
+      table.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
+
+      // Column 0
+      {
+        Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 0.0f, 0.0f, 1.0f ) );
+        backing.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
+        table.AddChild( backing, Toolkit::TableView::CellPosition( 0, 0 ) );
+      }
+      {
+        Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 1.0f, 0.0f, 1.0f ) );
+        backing.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
+        table.AddChild( backing, Toolkit::TableView::CellPosition( 1, 0 ) );
+      }
+      {
+        Actor backing = Toolkit::CreateSolidColorActor( Vector4( 0.0f, 1.0f, 0.0f, 1.0f ) );
+        backing.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
+        table.AddChild( backing, Toolkit::TableView::CellPosition( 2, 0 ) );
+      }
+
+      // Column 1
+      {
+        Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 0.0f, 1.0f, 1.0f ) );
+        backing.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
+        table.AddChild( backing, Toolkit::TableView::CellPosition( 0, 1 ) );
+      }
+      {
+        Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 1.0f, 1.0f, 1.0f ) );
+        backing.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
+        table.AddChild( backing, Toolkit::TableView::CellPosition( 1, 1 ) );
+      }
+      {
+        Actor backing = Toolkit::CreateSolidColorActor( Vector4( 0.0f, 0.0f, 1.0f, 1.0f ) );
+        backing.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
+        table.AddChild( backing, Toolkit::TableView::CellPosition( 2, 1 ) );
+      }
+
+      // Column 2
+      {
+        Actor backing = Toolkit::CreateSolidColorActor( Vector4( 0.0f, 0.0f, 0.0f, 1.0f ) );
+        backing.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
+        table.AddChild( backing, Toolkit::TableView::CellPosition( 0, 2 ) );
+      }
+      {
+        Actor backing = Toolkit::CreateSolidColorActor( Vector4( 0.5f, 0.5f, 0.5f, 1.0f ) );
+        backing.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
+        table.AddChild( backing, Toolkit::TableView::CellPosition( 1, 2 ) );
+      }
+      {
+        Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 0.5f, 0.0f, 1.0f ) );
+        backing.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
+        table.AddChild( backing, Toolkit::TableView::CellPosition( 2, 2 ) );
+      }
+
+      mPopup.Add( table );
+
+      // The popup is not yet on the stage so needs to be flaged as dirty
+      mPopup.MarkDirtyForRelayout();
+
+      mPopup.Show();
+    }
+    else if( button.GetName() == TABLEVIEW_BUTTON_FIXED1_ID )
+    {
+      mPopup = CreatePopup();
+      mPopup.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
+      mPopup.SetSizeMode( SIZE_RELATIVE_TO_PARENT );
+      mPopup.SetSizeModeFactor( Vector3( 0.75f, 0.5f, 1.0f ) );
+
+
+      Toolkit::TableView table = Toolkit::TableView::New( 3, 1 );
+      table.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
+      table.SetFixedHeight( 0, 50.0f );
+
+      {
+        Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 0.0f, 0.0f, 1.0f ) );
+        backing.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
+        Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fixed" );
+        text.SetAnchorPoint( AnchorPoint::CENTER );
+        text.SetParentOrigin( ParentOrigin::CENTER );
+        backing.Add( text );
+        table.Add( backing );
+      }
+      {
+        Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 1.0f, 0.0f, 1.0f ) );
+        backing.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
+        Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fill" );
+        text.SetAnchorPoint( AnchorPoint::CENTER );
+        text.SetParentOrigin( ParentOrigin::CENTER );
+        backing.Add( text );
+        table.Add( backing );
+      }
+      {
+        Actor backing = Toolkit::CreateSolidColorActor( Vector4( 0.0f, 1.0f, 0.0f, 1.0f ) );
+        backing.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
+        Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fill" );
+        text.SetAnchorPoint( AnchorPoint::CENTER );
+        text.SetParentOrigin( ParentOrigin::CENTER );
+        backing.Add( text );
+        table.Add( backing );
+      }
+
+      mPopup.Add( table );
+
+      // The popup is not yet on the stage so needs to be flaged as dirty
+      mPopup.MarkDirtyForRelayout();
+
+      mPopup.Show();
+    }
+    else if( button.GetName() == TABLEVIEW_BUTTON_FIXED2_ID )
+    {
+      mPopup = CreatePopup();
+      mPopup.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
+      mPopup.SetSizeMode( SIZE_RELATIVE_TO_PARENT );
+      mPopup.SetSizeModeFactor( Vector3( 0.75f, 0.5f, 1.0f ) );
+
+
+      Toolkit::TableView table = Toolkit::TableView::New( 3, 1 );
+      table.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
+      table.SetFixedHeight( 0, 50.0f );
+      table.SetFixedHeight( 2, 50.0f );
+
+      {
+        Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 0.0f, 0.0f, 1.0f ) );
+        backing.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
+        Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fixed" );
+        text.SetAnchorPoint( AnchorPoint::CENTER );
+        text.SetParentOrigin( ParentOrigin::CENTER );
+        backing.Add( text );
+        table.Add( backing );
+      }
+      {
+        Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 1.0f, 0.0f, 1.0f ) );
+        backing.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
+        Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fill" );
+        text.SetAnchorPoint( AnchorPoint::CENTER );
+        text.SetParentOrigin( ParentOrigin::CENTER );
+        backing.Add( text );
+        table.Add( backing );
+      }
+      {
+        Actor backing = Toolkit::CreateSolidColorActor( Vector4( 0.0f, 1.0f, 0.0f, 1.0f ) );
+        backing.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
+        Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fixed" );
+        text.SetAnchorPoint( AnchorPoint::CENTER );
+        text.SetParentOrigin( ParentOrigin::CENTER );
+        backing.Add( text );
+        table.Add( backing );
+      }
+
+      mPopup.Add( table );
+
+      // The popup is not yet on the stage so needs to be flaged as dirty
+      mPopup.MarkDirtyForRelayout();
+
+      mPopup.Show();
+    }
+    else if( button.GetName() == TABLEVIEW_BUTTON_FIT1_ID )
+    {
+      mPopup = CreatePopup();
+      mPopup.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
+      mPopup.SetSizeMode( SIZE_RELATIVE_TO_PARENT );
+      mPopup.SetSizeModeFactor( Vector3( 0.75f, 0.5f, 1.0f ) );
+
+
+      Toolkit::TableView table = Toolkit::TableView::New( 3, 1 );
+      table.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
+      table.SetFitHeight( 0 );
+      table.SetFitHeight( 2 );
+
+      {
+        Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 0.0f, 0.0f, 1.0f ) );
+        backing.SetResizePolicy( FILL_TO_PARENT, WIDTH );
+        backing.SetResizePolicy( FIXED, HEIGHT );
+        backing.SetPreferredSize( Vector2( 0.0f, 100.0f ) );
+
+        Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fit" );
+        text.SetAnchorPoint( AnchorPoint::CENTER );
+        text.SetParentOrigin( ParentOrigin::CENTER );
+        backing.Add( text );
+
+        table.Add( backing );
+      }
+      {
+        Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 1.0f, 0.0f, 1.0f ) );
+        backing.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
+
+        Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fill" );
+        text.SetAnchorPoint( AnchorPoint::CENTER );
+        text.SetParentOrigin( ParentOrigin::CENTER );
+        backing.Add( text );
+
+        table.Add( backing );
+      }
+      {
+        Actor backing = Toolkit::CreateSolidColorActor( Vector4( 0.0f, 1.0f, 0.0f, 1.0f ) );
+        backing.SetResizePolicy( FILL_TO_PARENT, WIDTH );
+        backing.SetResizePolicy( FIXED, HEIGHT );
+        backing.SetPreferredSize( Vector2( 0.0f, 100.0f ) );
+
+        Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fit" );
+        text.SetAnchorPoint( AnchorPoint::CENTER );
+        text.SetParentOrigin( ParentOrigin::CENTER );
+        backing.Add( text );
+
+        table.Add( backing );
+      }
+
+      mPopup.Add( table );
+
+      // The popup is not yet on the stage so needs to be flaged as dirty
+      mPopup.MarkDirtyForRelayout();
+
+      mPopup.Show();
+    }
+    else if( button.GetName() == TABLEVIEW_BUTTON_FIT2_ID )
+    {
+      mPopup = CreatePopup();
+      mPopup.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
+      mPopup.SetSizeMode( SIZE_RELATIVE_TO_PARENT );
+      mPopup.SetSizeModeFactor( Vector3( 0.75f, 0.5f, 1.0f ) );
+
+
+      Toolkit::TableView table = Toolkit::TableView::New( 3, 1 );
+      table.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
+      table.SetFitHeight( 1 );
+
+      {
+        Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 0.0f, 0.0f, 1.0f ) );
+        backing.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
+
+        Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fill" );
+        text.SetAnchorPoint( AnchorPoint::CENTER );
+        text.SetParentOrigin( ParentOrigin::CENTER );
+        backing.Add( text );
+
+        table.Add( backing );
+      }
+      {
+        Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 1.0f, 0.0f, 1.0f ) );
+        backing.SetResizePolicy( FILL_TO_PARENT, WIDTH );
+        backing.SetResizePolicy( FIXED, HEIGHT );
+        backing.SetPreferredSize( Vector2( 0.0f, 200.0f ) );
+
+        Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fit" );
+        text.SetAnchorPoint( AnchorPoint::CENTER );
+        text.SetParentOrigin( ParentOrigin::CENTER );
+        backing.Add( text );
+
+        table.Add( backing );
+      }
+      {
+        Actor backing = Toolkit::CreateSolidColorActor( Vector4( 0.0f, 1.0f, 0.0f, 1.0f ) );
+        backing.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
+
+        Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fill" );
+        text.SetAnchorPoint( AnchorPoint::CENTER );
+        text.SetParentOrigin( ParentOrigin::CENTER );
+        backing.Add( text );
+
+        table.Add( backing );
+      }
+
+      mPopup.Add( table );
+
+      // The popup is not yet on the stage so needs to be flaged as dirty
+      mPopup.MarkDirtyForRelayout();
+
+      mPopup.Show();
+    }
+    else if( button.GetName() == TABLEVIEW_BUTTON_NATURAL1_ID )
+    {
+      mPopup = CreatePopup();
+      mPopup.SetResizePolicy( FILL_TO_PARENT, WIDTH );
+      mPopup.SetSizeMode( SIZE_RELATIVE_TO_PARENT );
+      mPopup.SetSizeModeFactor( Vector3( 0.75f, 1.0f, 1.0f ) );
+      mPopup.SetResizePolicy( FIT_TO_CHILDREN, HEIGHT );
+
+      Toolkit::TableView table = Toolkit::TableView::New( 3, 1 );
+      table.SetResizePolicy( FILL_TO_PARENT, WIDTH );
+      table.SetResizePolicy( USE_NATURAL_SIZE, HEIGHT );
+      table.SetFitHeight( 0 );
+      table.SetFitHeight( 1 );
+      table.SetFitHeight( 2 );
+
+      {
+        Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 0.0f, 0.0f, 1.0f ) );
+        backing.SetResizePolicy( FILL_TO_PARENT, WIDTH );
+        backing.SetResizePolicy( FIXED, HEIGHT );
+        backing.SetPreferredSize( Vector2( 0.0f, 100.0f ) );
+
+        Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fit" );
+        text.SetAnchorPoint( AnchorPoint::CENTER );
+        text.SetParentOrigin( ParentOrigin::CENTER );
+        backing.Add( text );
+
+        table.Add( backing );
+      }
+      {
+        Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 1.0f, 0.0f, 1.0f ) );
+        backing.SetResizePolicy( FILL_TO_PARENT, WIDTH );
+        backing.SetResizePolicy( FIXED, HEIGHT );
+        backing.SetPreferredSize( Vector2( 0.0f, 200.0f ) );
+
+        Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fit" );
+        text.SetAnchorPoint( AnchorPoint::CENTER );
+        text.SetParentOrigin( ParentOrigin::CENTER );
+        backing.Add( text );
+
+        table.Add( backing );
+      }
+      {
+        Actor backing = Toolkit::CreateSolidColorActor( Vector4( 0.0f, 1.0f, 0.0f, 1.0f ) );
+        backing.SetResizePolicy( FILL_TO_PARENT, WIDTH );
+        backing.SetResizePolicy( FIXED, HEIGHT );
+        backing.SetPreferredSize( Vector2( 0.0f, 300.0f ) );
+
+        Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fit" );
+        text.SetAnchorPoint( AnchorPoint::CENTER );
+        text.SetParentOrigin( ParentOrigin::CENTER );
+        backing.Add( text );
+
+        table.Add( backing );
+      }
+
+      mPopup.Add( table );
+
+      // The popup is not yet on the stage so needs to be flaged as dirty
+      mPopup.MarkDirtyForRelayout();
+
+      mPopup.Show();
+    }
+    else if( button.GetName() == TABLEVIEW_BUTTON_NATURAL2_ID )
+    {
+      mPopup = CreatePopup();
+      mPopup.SetResizePolicy( FILL_TO_PARENT, WIDTH );
+      mPopup.SetSizeMode( SIZE_RELATIVE_TO_PARENT );
+      mPopup.SetSizeModeFactor( Vector3( 0.75f, 1.0f, 1.0f ) );
+      mPopup.SetResizePolicy( FIT_TO_CHILDREN, HEIGHT );
+
+      Toolkit::TableView table = Toolkit::TableView::New( 3, 1 );
+      table.SetResizePolicy( FILL_TO_PARENT, WIDTH );
+      table.SetResizePolicy( USE_NATURAL_SIZE, HEIGHT );
+      table.SetFitHeight( 0 );
+      table.SetFitHeight( 1 );
+
+      {
+        Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 0.0f, 0.0f, 1.0f ) );
+        backing.SetResizePolicy( FILL_TO_PARENT, WIDTH );
+        backing.SetResizePolicy( FIXED, HEIGHT );
+        backing.SetPreferredSize( Vector2( 0.0f, 100.0f ) );
+
+        Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fit" );
+        text.SetAnchorPoint( AnchorPoint::CENTER );
+        text.SetParentOrigin( ParentOrigin::CENTER );
+        backing.Add( text );
+
+        table.Add( backing );
+      }
+      {
+        Actor backing = Toolkit::CreateSolidColorActor( Vector4( 0.0f, 1.0f, 0.0f, 1.0f ) );
+        backing.SetResizePolicy( FILL_TO_PARENT, WIDTH );
+        backing.SetResizePolicy( FIXED, HEIGHT );
+        backing.SetPreferredSize( Vector2( 0.0f, 200.0f ) );
+
+        Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fit" );
+        text.SetAnchorPoint( AnchorPoint::CENTER );
+        text.SetParentOrigin( ParentOrigin::CENTER );
+        backing.Add( text );
+
+        table.Add( backing );
+      }
+
+      mPopup.Add( table );
+
+      // The popup is not yet on the stage so needs to be flaged as dirty
+      mPopup.MarkDirtyForRelayout();
+
+      mPopup.Show();
+    }
+    else if( button.GetName() == TABLEVIEW_BUTTON_NATURAL3_ID )
+    {
+      mPopup = CreatePopup();
+      mPopup.SetResizePolicy( FILL_TO_PARENT, WIDTH );
+      mPopup.SetSizeMode( SIZE_RELATIVE_TO_PARENT );
+      mPopup.SetSizeModeFactor( Vector3( 0.75f, 1.0f, 1.0f ) );
+      mPopup.SetResizePolicy( FIT_TO_CHILDREN, HEIGHT );
+
+      Toolkit::TableView table = Toolkit::TableView::New( 3, 1 );
+      table.SetResizePolicy( FILL_TO_PARENT, WIDTH );
+      table.SetResizePolicy( USE_NATURAL_SIZE, HEIGHT );
+      table.SetFixedHeight( 0, 20.0f );
+      table.SetFitHeight( 1 );
+
+      {
+        Actor backing = Toolkit::CreateSolidColorActor( Vector4( 1.0f, 0.0f, 0.0f, 1.0f ) );
+        backing.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
+
+        Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fixed" );
+        text.SetAnchorPoint( AnchorPoint::CENTER );
+        text.SetParentOrigin( ParentOrigin::CENTER );
+        backing.Add( text );
+
+        table.Add( backing );
+      }
+      {
+        Actor backing = Toolkit::CreateSolidColorActor( Vector4( 0.0f, 1.0f, 0.0f, 1.0f ) );
+        backing.SetResizePolicy( FILL_TO_PARENT, WIDTH );
+        backing.SetResizePolicy( FIXED, HEIGHT );
+        backing.SetPreferredSize( Vector2( 0.0f, 200.0f ) );
+
+        Toolkit::TextLabel text = Toolkit::TextLabel::New( "Fit" );
+        text.SetAnchorPoint( AnchorPoint::CENTER );
+        text.SetParentOrigin( ParentOrigin::CENTER );
+        backing.Add( text );
+
+        table.Add( backing );
+      }
+
+      mPopup.Add( table );
+
+      // The popup is not yet on the stage so needs to be flaged as dirty
+      mPopup.MarkDirtyForRelayout();
+
+      mPopup.Show();
+    }
+    else if( button.GetName() == OKAY_BUTTON_ID || button.GetName() == CANCEL_BUTTON_ID )
+    {
+      if( mPopup )
+      {
+        mPopup.Hide();
+      }
+    }
+
+    return true;
+  }
+
+  void OnPopupOutsideTouched()
+  {
+    if( mPopup )
+    {
+      mPopup.Hide();
+    }
+  }
+
+  void OnKeyEvent( const KeyEvent& event )
+  {
+    if( event.state == KeyEvent::Down )
+    {
+      if( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
+      {
+        // Exit application when click back or escape.
+        mApplication.Quit();
+      }
+    }
+  }
+
+public: // From ItemFactory
+
+  /**
+   * @brief Return the number of items to display in the item view
+   *
+   * @return Return the number of items to display
+   */
+  virtual unsigned int GetNumberOfItems()
+  {
+    switch( mDemoState )
+    {
+      case POPUP:
+      {
+        return POPUP_BUTTON_ITEMS_COUNT;
+      }
+
+      case TABLEVIEW:
+      {
+        return TABLEVIEW_BUTTON_ITEMS_COUNT;
+      }
+
+      default:
+      {
+        break;
+      }
+    }
+
+    return 0;
+  }
+
+  /**
+   * @brief Create a new item to populate the item view with
+   *
+   * @param[in] itemId The index of the item to create
+   * @return Return the created actor for the given ID
+   */
+  virtual Actor NewItem(unsigned int itemId)
+  {
+    const ButtonItem* buttonDataArray = NULL;
+    switch( mDemoState )
+    {
+      case POPUP:
+      {
+        buttonDataArray = POPUP_BUTTON_ITEMS;
+        break;
+      }
+
+      case TABLEVIEW:
+      {
+        buttonDataArray = TABLEVIEW_BUTTON_ITEMS;
+        break;
+      }
+
+      default:
+      {
+        break;
+      }
+    }
+
+    if( buttonDataArray )
+    {
+      Toolkit::PushButton popupButton = Toolkit::PushButton::New();
+      popupButton.SetName( buttonDataArray[ itemId ].name );
+      popupButton.SetLabel( buttonDataArray[ itemId ].text );
+      popupButton.SetResizePolicy( USE_NATURAL_SIZE, ALL_DIMENSIONS );
+
+      popupButton.SetSelectedImage( Dali::ResourceImage::New( PUSHBUTTON_PRESS_IMAGE ) );
+      popupButton.SetButtonImage( Dali::ResourceImage::New( PUSHBUTTON_BUTTON_IMAGE ) );
+
+      popupButton.ClickedSignal().Connect( this, &SizeNegotiationController::OnButtonClicked );
+
+      return popupButton;
+    }
+
+    return Actor();
+  }
+
+private:
+
+  enum DemoState
+  {
+    POPUP,
+    TABLEVIEW
+  };
+
+  Application&      mApplication;
+  Toolkit::View     mView;                   ///< The View instance.
+  Toolkit::ToolBar  mToolBar;                ///< The View's Toolbar.
+  Layer             mContentLayer;           ///< Content layer
+
+  Toolkit::TextLabel mTitleActor;             ///< Title text
+
+  Toolkit::Popup    mMenu;                   ///< The navigation menu
+  bool              mMenuShown;              ///< If the navigation menu is currently being displayed or not
+
+  Toolkit::Popup    mPopup;
+
+  Toolkit::ItemView mItemView;               ///< ItemView to hold test images
+
+  DemoState mDemoState;
+};
+
+void RunTest( Application& application )
+{
+  SizeNegotiationController test( application );
+
+  application.MainLoop();
+}
+
+// Entry point for Linux & SLP applications
+//
+int main( int argc, char **argv )
+{
+  Application application = Application::New( &argc, &argv );
+
+  RunTest( application );
+
+  return 0;
+}
-/*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// CLASS HEADER
-#include "edit-layout-impl.h"
-
-// INTERNAL INCLUDES
-#include "edit-layout.h"
-
-namespace
-{
-
-const float INNER_BORDER_TOP = 4.0f;
-const float INNER_BORDER_LEFT = 20.0f;
-const float INNER_BORDER_RIGHT = 20.0f;
-
-}
-
-namespace Dali
-{
-
-namespace Toolkit
-{
-
-namespace Internal
-{
-
-Toolkit::EditLayout EditLayout::New()
-{
-  // Create the implementation, temporarily owned by this handle on stack
-  IntrusivePtr< EditLayout > impl = new EditLayout();
-
-  // Pass ownership to CustomActor handle
-  Toolkit::EditLayout handle( *impl );
-
-  // Second-phase init of the implementation
-  // This can only be done after the CustomActor connection has been made...
-  impl->Initialize();
-
-  return handle;
-}
-
-void EditLayout::SetTopPanel( Dali::Toolkit::Control panel )
-{
-  mTopPanel = panel;
-  mTopPanel.SetParentOrigin( ParentOrigin::TOP_CENTER );
-  mTopPanel.SetAnchorPoint( AnchorPoint::TOP_CENTER );
-  mTopPanel.SetY( INNER_BORDER_TOP );
-
-  Self().Add( panel );
-}
-
-EditLayout::EditLayout()
-: Control( ControlBehaviour( CONTROL_BEHAVIOUR_NONE ) )
-{
-}
-
-EditLayout::~EditLayout()
-{
-}
-
-void EditLayout::OnInitialize()
-{
-  CustomActor self = Self();
-
-  // Move background behind text label
-  Dali::Toolkit::Control::DownCast( self ).SetBackgroundColor( Color::BLUE );
-  self.GetChildAt(0).SetZ(-1.0f);
-}
-
-void EditLayout::OnRelayout( const Vector2& size, ActorSizeContainer& container )
-{
-  CustomActor self = Self();
-
-  if( self.GetChildCount() > 0 )
-  {
-    if( mTopPanel )
-    {
-      float panelWidth = size.width - INNER_BORDER_LEFT - INNER_BORDER_RIGHT;
-
-      float height = mTopPanel.GetHeightForWidth( panelWidth );
-
-      mTopPanel.SetSize( Vector2(panelWidth, height) );
-
-      container.push_back( ActorSizePair( mTopPanel, Vector2(panelWidth, height) ) );
-    }
-  }
-}
-
-} // namespace Internal
-
-} // namespace Toolkit
-
-} // namespace Dali
-#ifndef __DALI_DEMO_EDIT_LAYOUT_IMPL_H__
-#define __DALI_DEMO_EDIT_LAYOUT_IMPL_H__
-
-/*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// INTERNAL INCLUDES
-#include "edit-layout.h"
-
-namespace Dali
-{
-
-namespace Toolkit
-{
-
-namespace Internal
-{
-
-class EditLayout : public Control
-{
-public:
-  /**
-   * @copydoc Dali::Toollkit::TextLabel::New()
-   */
-  static Toolkit::EditLayout New();
-
-  /**
-   * @copydoc Dali::Toolkit::EditLayout::SetTopPanel()
-   */
-  void SetTopPanel( Dali::Toolkit::Control panel );
-
-  EditLayout();
-
-  virtual ~EditLayout();
-
-  /**
-   * @copydoc Control::OnInitialize()
-   */
-  virtual void OnInitialize();
-
-  // Size negotiation methods inherited from Internal::Control
-
-  /**
-   * @copydoc Control::OnRelayout()
-   */
-  virtual void OnRelayout( const Vector2& size, ActorSizeContainer& container );
-
-private:
-
-  // Undefined copy constructor and assignment operators
-  EditLayout(const EditLayout&);
-  EditLayout& operator=(const EditLayout& rhs);
-
-private:
-
-  Dali::Toolkit::Control mTopPanel;
-};
-
-} // namespace Internal
-
-} // namespace Toolkit
-
-} // namespace Dali
-
-#endif // __DALI_DEMO_EDIT_LAYOUT_IMPL_H__
-#ifndef __DALI_DEMO_EDIT_LAYOUT_H__
-#define __DALI_DEMO_EDIT_LAYOUT_H__
-
-/*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// EXTERNAL INCLUDES
-#include <dali-toolkit/dali-toolkit.h>
-
-namespace Dali
-{
-
-namespace Toolkit
-{
-
-namespace Internal
-{
-class EditLayout;
-} // namespace Internal
-
-class EditLayout : public Toolkit::Control
-{
-public:
-  static EditLayout New();
-
-  void SetTopPanel( Control panel );
-
-  EditLayout();
-
-  EditLayout( const EditLayout& handle );
-
-  EditLayout& operator=( const EditLayout& handle );
-
-  ~EditLayout();
-
-  EditLayout( Internal::EditLayout& internal );
-
-  explicit EditLayout( Dali::Internal::CustomActor* internal );
-
-  EditLayout DownCast( BaseHandle handle );
-
-  Internal::EditLayout& GetImpl( EditLayout& verticalLayout );
-
-private:
-};
-
-} // namespace Toolkit
-
-} // namespace Dali
-
-#endif // __DALI_DEMO_EDIT_LAYOUT_H__
@@ -24,15 +24,14 @@
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali/public-api/text-abstraction/text-abstraction.h>
-// INTERNAL INCLUDES
-#include "edit-layout.h"
-
 using namespace Dali;
 using namespace Dali::Toolkit;
 namespace
 {
+const char* const BACKGROUND_IMAGE = DALI_IMAGE_DIR "button-up.9.png";
+
 const float BORDER_WIDTH = 4.0f;
 } // unnamed namespace
@@ -67,16 +66,17 @@ public:
     Vector2 stageSize = stage.GetSize();
-    EditLayout layout = EditLayout::New();
-    layout.SetParentOrigin( ParentOrigin::CENTER );
-    layout.SetAnchorPoint( AnchorPoint::CENTER );
-    layout.SetSize( stageSize.width - BORDER_WIDTH*2.0f, stageSize.height*0.2f );
-    stage.Add( layout );
+    mContainer = Control::New();
+    mContainer.SetName( "Container" );
+    mContainer.SetParentOrigin( ParentOrigin::CENTER );
+    mContainer.SetResizePolicy( FIXED, ALL_DIMENSIONS );
+    mContainer.SetPreferredSize( Vector2(stageSize.width*0.6f, stageSize.width*0.6f) );
+    mContainer.SetBackgroundImage( ResourceImage::New( BACKGROUND_IMAGE ) );
+    mContainer.GetChildAt(0).SetZ(-1.0f);
+    stage.Add( mContainer );
     TextField field = TextField::New();
-    field.SetParentOrigin( ParentOrigin::CENTER );
-    field.SetBackgroundColor( Color::BLACK );
-    layout.SetTopPanel( field );
+    mContainer.Add( field );
     field.SetProperty( TextField::Property::TEXT, "Hello" );
@@ -101,6 +101,8 @@ public:
 private:
   Application& mApplication;
+
+  Control mContainer;
 };
 void RunTest( Application& application )
@@ -15,16 +15,14 @@
  *
  */
-// INTERNAL INCLUDES
-
-#include "vertical-layout.h"
-#include "emoji-strings.h"
-
 // EXTERNAL INCLUDES
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali/public-api/text-abstraction/text-abstraction.h>
 #include <iostream>
+// INTERNAL INCLUDES
+#include "emoji-strings.h"
+
 using namespace Dali;
 using namespace Dali::Toolkit;
 using namespace EmojiStrings;
@@ -57,32 +55,30 @@ public:
   // The Init signal is received once (only) during the Application lifetime
   void Create( Application& application )
   {
-
-    mLayout = VerticalLayout::New();
-    mLayout.SetParentOrigin( ParentOrigin::TOP_LEFT );
-    mLayout.SetAnchorPoint( AnchorPoint::TOP_LEFT );
     Stage stage = Stage::GetCurrent();
-    stage.Add( mLayout );
     stage.KeyEventSignal().Connect(this, &EmojiExample::OnKeyEvent);
+    mTableView = Toolkit::TableView::New( NUMBER_OF_EMOJIS, 1 );
+    mTableView.SetResizePolicy( FILL_TO_PARENT, WIDTH );
+    mTableView.SetResizePolicy( USE_NATURAL_SIZE, HEIGHT );
+    mTableView.SetParentOrigin( ParentOrigin::TOP_LEFT );
+    mTableView.SetAnchorPoint( AnchorPoint::TOP_LEFT );
+    mTableView.TouchedSignal().Connect( this, &EmojiExample::OnTouchEvent );
+    stage.Add( mTableView );
+
     for( unsigned int index = 0u; index < NUMBER_OF_EMOJIS; ++index )
     {
       const Emoji& emoji = EMOJIS[index];
       const std::string text = emoji.mUTF8 + " " + emoji.mDescription;
-      TextLabel label = TextLabel::New();
+
+      TextLabel label = TextLabel::New( text );
       label.SetParentOrigin( ParentOrigin::TOP_CENTER );
       label.SetAnchorPoint( AnchorPoint::TOP_CENTER );
       label.SetProperty( TextLabel::Property::MULTI_LINE, true );
-      label.SetProperty( TextLabel::Property::TEXT, text );
-      mLayout.AddLabel( label );
-      mLayout.TouchedSignal().Connect( this, &EmojiExample::OnTouchEvent );
-    }
-
-    const Vector2& size = stage.GetSize();
-    const float height = mLayout.GetHeightForWidth( size.width );
-    mLayout.SetSize( Size( size.width, height ) );
-    mLayout.TouchedSignal().Connect( this, &EmojiExample::OnTouchEvent );
+      mTableView.SetFitHeight( index );
+      mTableView.AddChild( label, Toolkit::TableView::CellPosition( index, 0 ) );
+    }
   }
   bool OnTouchEvent( Actor actor, const TouchEvent& event )
@@ -103,7 +99,7 @@ public:
       {
         if( mAnimation )
         {
-          mAnimation.MoveBy( mLayout, Vector3( 0.f, localPoint - mLastPoint, 0.f ), AlphaFunctions::Linear );
+          mAnimation.MoveBy( mTableView, Vector3( 0.f, localPoint - mLastPoint, 0.f ), AlphaFunctions::Linear );
           mAnimation.Play();
           mLastPoint = localPoint;
         }
@@ -130,7 +126,7 @@ public:
 private:
   Application&  mApplication;
-  VerticalLayout mLayout;
+  TableView      mTableView;
   Animation      mAnimation;
   float          mLastPoint;
 };
-/*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// CLASS HEADER
-#include "vertical-layout-impl.h"
-
-// INTERNAL INCLUDES
-#include "vertical-layout.h"
-
-namespace Dali
-{
-
-namespace Toolkit
-{
-
-namespace Internal
-{
-
-Toolkit::VerticalLayout VerticalLayout::New()
-{
-  // Create the implementation, temporarily owned by this handle on stack
-  IntrusivePtr< VerticalLayout > impl = new VerticalLayout();
-
-  // Pass ownership to CustomActor handle
-  Toolkit::VerticalLayout handle( *impl );
-
-  // Second-phase init of the implementation
-  // This can only be done after the CustomActor connection has been made...
-  impl->Initialize();
-
-  return handle;
-}
-
-VerticalLayout::VerticalLayout()
-: Control( ControlBehaviour( CONTROL_BEHAVIOUR_NONE ) )
-{
-}
-
-VerticalLayout::~VerticalLayout()
-{
-}
-
-void VerticalLayout::OnInitialize()
-{
-}
-
-Vector3 VerticalLayout::GetNaturalSize()
-{
-  Vector3 size = Vector3::ZERO;
-
-  CustomActor self = Self();
-  for( unsigned int index = 0u, count = self.GetChildCount(); index < count; ++index )
-  {
-    Toolkit::TextLabel label = Toolkit::TextLabel::DownCast( self.GetChildAt( index ) );
-
-    if( label )
-    {
-      Vector3 labelSize = label.GetNaturalSize();
-
-      size.width = ( labelSize.width > size.width ) ? labelSize.width : size.width;
-      size.height += labelSize.height;
-    }
-  }
-
-  return size;
-}
-
-float VerticalLayout::GetHeightForWidth( float width )
-{
-  float height = 0.f;
-
-  CustomActor self = Self();
-  for( unsigned int index = 0u, count = self.GetChildCount(); index < count; ++index )
-  {
-    Toolkit::TextLabel label = Toolkit::TextLabel::DownCast( self.GetChildAt( index ) );
-
-    if( label )
-    {
-      height += label.GetHeightForWidth( width );
-    }
-  }
-
-  return height;
-}
-
-float VerticalLayout::GetWidthForHeight( float height )
-{
-  return 0.f;
-}
-
-void VerticalLayout::OnFontChange( bool defaultFontChange, bool defaultFontSizeChange )
-{
-}
-
-void VerticalLayout::OnRelayout( const Vector2& size, ActorSizeContainer& container )
-{
-  CustomActor self = Self();
-
-  Vector3 position;
-  for( unsigned int index = 0u, count = self.GetChildCount(); index < count; ++index )
-  {
-    Size childSize = size;
-    Toolkit::TextLabel label = Toolkit::TextLabel::DownCast( self.GetChildAt( index ) );
-
-    if( label )
-    {
-      label.SetPosition( position );
-
-      childSize.height = label.GetHeightForWidth( size.width );
-      position.height += childSize.height;
-
-      label.SetSize( childSize );
-    }
-
-    container.push_back( ActorSizePair( label, childSize ) );
-  }
-}
-
-void VerticalLayout::AddLabel( Toolkit::TextLabel label )
-{
-  Self().Add( label );
-
-  RelayoutRequest();
-}
-
-} // namespace Internal
-
-} // namespace Toolkit
-
-} // namespace Dali
-#ifndef __DALI_DEMO_VERTICAL_LAYOUT_IMPL_H__
-#define __DALI_DEMO_VERTICAL_LAYOUT_IMPL_H__
-
-/*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// INTERNAL INCLUDES
-#include "vertical-layout.h"
-
-namespace Dali
-{
-
-namespace Toolkit
-{
-
-namespace Internal
-{
-
-class VerticalLayout : public Control
-{
-public:
-  /**
-   * @copydoc Dali::Toollkit::TextLabel::New()
-   */
-  static Toolkit::VerticalLayout New();
-
-  VerticalLayout();
-
-  virtual ~VerticalLayout();
-
-  /**
-   * @copydoc Control::OnInitialize()
-   */
-  virtual void OnInitialize();
-
-  // Size negotiation methods inherited from Internal::Control
-
-  /**
-   * @copydoc Control::GetNaturalSize()
-   */
-  virtual Vector3 GetNaturalSize();
-
-  /**
-   * @copydoc Control::GetHeightForWidth()
-   */
-  virtual float GetHeightForWidth( float width );
-
-  /**
-   * @copydoc Control::GetWidthForHeight()
-   */
-  virtual float GetWidthForHeight( float height );
-
-  /**
-   * @copydoc Control::OnFontChange()
-   */
-  virtual void OnFontChange( bool defaultFontChange, bool defaultFontSizeChange );
-
-  /**
-   * @copydoc Control::OnRelayout()
-   */
-  virtual void OnRelayout( const Vector2& size, ActorSizeContainer& container );
-
-  void AddLabel( Toolkit::TextLabel label );
-
-private:
-  // Undefined copy constructor and assignment operators
-  VerticalLayout(const VerticalLayout&);
-  VerticalLayout& operator=(const VerticalLayout& rhs);
-};
-
-} // namespace Internal
-
-} // namespace Toolkit
-
-} // namespace Dali
-
-#endif // __DALI_DEMO_VERTICAL_LAYOUT_IMPL_H__
-/*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// CLASS HEADER
-#include "vertical-layout.h"
-
-// INTERNAL INCLUDES
-#include "vertical-layout-impl.h"
-
-namespace Dali
-{
-
-namespace Toolkit
-{
-
-VerticalLayout VerticalLayout::New()
-{
-  return Internal::VerticalLayout::New();
-}
-
-VerticalLayout::VerticalLayout()
-{
-}
-
-VerticalLayout::VerticalLayout( const VerticalLayout& handle )
-: Control( handle )
-{
-}
-
-VerticalLayout& VerticalLayout::operator=( const VerticalLayout& handle )
-{
-  if( &handle != this )
-  {
-    Control::operator=( handle );
-  }
-  return *this;
-}
-
-VerticalLayout VerticalLayout::DownCast( BaseHandle handle )
-{
-  return Control::DownCast<VerticalLayout, Internal::VerticalLayout>( handle );
-}
-
-VerticalLayout::~VerticalLayout()
-{
-}
-
-VerticalLayout::VerticalLayout( Internal::VerticalLayout& internal )
-: Control( internal )
-{
-}
-
-VerticalLayout::VerticalLayout( Dali::Internal::CustomActor* internal )
-: Control( internal )
-{
-}
-
-void VerticalLayout::AddLabel( TextLabel label )
-{
-  GetImpl( *this ).AddLabel( label );
-}
-
-Internal::VerticalLayout& VerticalLayout::GetImpl( VerticalLayout& verticalLayout )
-{
-  DALI_ASSERT_ALWAYS( verticalLayout );
-
-  Dali::RefObject& handle = verticalLayout.GetImplementation();
-
-  return static_cast<Internal::VerticalLayout&>(handle);
-}
-
-} // namespace Toolkit
-
-} // namespace Dali
-#ifndef __DALI_DEMO_VERTICAL_LAYOUT_H__
-#define __DALI_DEMO_VERTICAL_LAYOUT_H__
-
-/*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// EXTERNAL INCLUDES
-#include <dali-toolkit/dali-toolkit.h>
-
-namespace Dali
-{
-
-namespace Toolkit
-{
-
-namespace Internal
-{
-class VerticalLayout;
-} // namespace Internal
-
-class VerticalLayout : public Toolkit::Control
-{
-public:
-  static VerticalLayout New();
-
-  VerticalLayout();
-
-  VerticalLayout( const VerticalLayout& handle );
-
-  VerticalLayout& operator=( const VerticalLayout& handle );
-
-  ~VerticalLayout();
-
-  VerticalLayout( Internal::VerticalLayout& internal );
-
-  explicit VerticalLayout( Dali::Internal::CustomActor* internal );
-
-  VerticalLayout DownCast( BaseHandle handle );
-
-  void AddLabel( TextLabel label );
-
-  Internal::VerticalLayout& GetImpl( VerticalLayout& verticalLayout );
-
-private:
-};
-
-} // namespace Toolkit
-
-} // namespace Dali
-
-#endif // __DALI_DEMO_VERTICAL_LAYOUT_H__
@@ -21,7 +21,6 @@
  */
 // INTERNAL INCLUDES
-#include "vertical-layout.h"
 #include "shared/multi-language-strings.h"
 // EXTERNAL INCLUDES
@@ -61,33 +60,27 @@ public:
     stage.KeyEventSignal().Connect(this, &TextLabelMultiLanguageExample::OnKeyEvent);
-    mLayout = VerticalLayout::New();
-    mLayout.SetParentOrigin( ParentOrigin::TOP_LEFT );
-    mLayout.SetAnchorPoint( AnchorPoint::TOP_LEFT );
-
-    stage.Add( mLayout );
+    mTableView = Toolkit::TableView::New( NUMBER_OF_LANGUAGES, 1 );
+    mTableView.SetResizePolicy( FILL_TO_PARENT, WIDTH );
+    mTableView.SetResizePolicy( USE_NATURAL_SIZE, HEIGHT );
+    mTableView.SetParentOrigin( ParentOrigin::TOP_LEFT );
+    mTableView.SetAnchorPoint( AnchorPoint::TOP_LEFT );
+    mTableView.TouchedSignal().Connect( this, &TextLabelMultiLanguageExample::OnTouchEvent );
+    stage.Add( mTableView );
     for( unsigned int index = 0u; index < NUMBER_OF_LANGUAGES; ++index )
     {
       const Language& language = LANGUAGES[index];
       TextLabel label = TextLabel::New();
-      label.SetParentOrigin( ParentOrigin::TOP_CENTER );
-      label.SetAnchorPoint( AnchorPoint::TOP_CENTER );
-
       label.SetProperty( TextLabel::Property::MULTI_LINE, true );
       const std::string text = language.languageName + " " + language.languageRomanName + " " + language.text;
-
       label.SetProperty( TextLabel::Property::TEXT, text );
-      mLayout.AddLabel( label );
-      mLayout.TouchedSignal().Connect( this, &TextLabelMultiLanguageExample::OnTouchEvent );
+      mTableView.SetFitHeight( index );
+      mTableView.AddChild( label, Toolkit::TableView::CellPosition( index, 0 ) );
     }
-
-    const Vector2& size = Stage::GetCurrent().GetSize();
-    const float height = mLayout.GetHeightForWidth( size.width );
-    mLayout.SetSize( Size( size.width, height ) );
   }
   bool OnTouchEvent( Actor actor, const TouchEvent& event )
@@ -108,7 +101,7 @@ public:
       {
         if( mAnimation )
         {
-          mAnimation.MoveBy( mLayout, Vector3( 0.f, localPoint - mLastPoint, 0.f ), AlphaFunctions::Linear );
+          mAnimation.MoveBy( mTableView, Vector3( 0.f, localPoint - mLastPoint, 0.f ), AlphaFunctions::Linear );
           mAnimation.Play();
           mLastPoint = localPoint;
         }
@@ -135,7 +128,7 @@ public:
 private:
   Application&   mApplication;
-  VerticalLayout mLayout;
+  TableView      mTableView;
   Animation      mAnimation;
   float          mLastPoint;
 };
-/*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// CLASS HEADER
-#include "vertical-layout-impl.h"
-
-// INTERNAL INCLUDES
-#include "vertical-layout.h"
-
-namespace Dali
-{
-
-namespace Toolkit
-{
-
-namespace Internal
-{
-
-Toolkit::VerticalLayout VerticalLayout::New()
-{
-  // Create the implementation, temporarily owned by this handle on stack
-  IntrusivePtr< VerticalLayout > impl = new VerticalLayout();
-
-  // Pass ownership to CustomActor handle
-  Toolkit::VerticalLayout handle( *impl );
-
-  // Second-phase init of the implementation
-  // This can only be done after the CustomActor connection has been made...
-  impl->Initialize();
-
-  return handle;
-}
-
-VerticalLayout::VerticalLayout()
-: Control( ControlBehaviour( CONTROL_BEHAVIOUR_NONE ) )
-{
-}
-
-VerticalLayout::~VerticalLayout()
-{
-}
-
-void VerticalLayout::OnInitialize()
-{
-}
-
-Vector3 VerticalLayout::GetNaturalSize()
-{
-  Vector3 size = Vector3::ZERO;
-
-  CustomActor self = Self();
-  for( unsigned int index = 0u, count = self.GetChildCount(); index < count; ++index )
-  {
-    Toolkit::TextLabel label = Toolkit::TextLabel::DownCast( self.GetChildAt( index ) );
-
-    if( label )
-    {
-      Vector3 labelSize = label.GetNaturalSize();
-
-      size.width = ( labelSize.width > size.width ) ? labelSize.width : size.width;
-      size.height += labelSize.height;
-    }
-  }
-
-  return size;
-}
-
-float VerticalLayout::GetHeightForWidth( float width )
-{
-  float height = 0.f;
-
-  CustomActor self = Self();
-  for( unsigned int index = 0u, count = self.GetChildCount(); index < count; ++index )
-  {
-    Toolkit::TextLabel label = Toolkit::TextLabel::DownCast( self.GetChildAt( index ) );
-
-    if( label )
-    {
-      height += label.GetHeightForWidth( width );
-    }
-  }
-
-  return height;
-}
-
-float VerticalLayout::GetWidthForHeight( float height )
-{
-  return 0.f;
-}
-
-void VerticalLayout::OnFontChange( bool defaultFontChange, bool defaultFontSizeChange )
-{
-}
-
-void VerticalLayout::OnRelayout( const Vector2& size, ActorSizeContainer& container )
-{
-  CustomActor self = Self();
-
-  Vector3 position;
-  for( unsigned int index = 0u, count = self.GetChildCount(); index < count; ++index )
-  {
-    Size childSize = size;
-    Toolkit::TextLabel label = Toolkit::TextLabel::DownCast( self.GetChildAt( index ) );
-
-    if( label )
-    {
-      label.SetPosition( position );
-
-      childSize.height = label.GetHeightForWidth( size.width );
-      position.height += childSize.height;
-
-      label.SetSize( childSize );
-    }
-
-    container.push_back( ActorSizePair( label, childSize ) );
-  }
-}
-
-void VerticalLayout::AddLabel( Toolkit::TextLabel label )
-{
-  Self().Add( label );
-
-  RelayoutRequest();
-}
-
-} // namespace Internal
-
-} // namespace Toolkit
-
-} // namespace Dali
-#ifndef __DALI_DEMO_VERTICAL_LAYOUT_IMPL_H__
-#define __DALI_DEMO_VERTICAL_LAYOUT_IMPL_H__
-
-/*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// INTERNAL INCLUDES
-#include "vertical-layout.h"
-
-namespace Dali
-{
-
-namespace Toolkit
-{
-
-namespace Internal
-{
-
-class VerticalLayout : public Control
-{
-public:
-  /**
-   * @copydoc Dali::Toollkit::TextLabel::New()
-   */
-  static Toolkit::VerticalLayout New();
-
-  VerticalLayout();
-
-  virtual ~VerticalLayout();
-
-  /**
-   * @copydoc Control::OnInitialize()
-   */
-  virtual void OnInitialize();
-
-  // Size negotiation methods inherited from Internal::Control
-
-  /**
-   * @copydoc Control::GetNaturalSize()
-   */
-  virtual Vector3 GetNaturalSize();
-
-  /**
-   * @copydoc Control::GetHeightForWidth()
-   */
-  virtual float GetHeightForWidth( float width );
-
-  /**
-   * @copydoc Control::GetWidthForHeight()
-   */
-  virtual float GetWidthForHeight( float height );
-
-  /**
-   * @copydoc Control::OnFontChange()
-   */
-  virtual void OnFontChange( bool defaultFontChange, bool defaultFontSizeChange );
-
-  /**
-   * @copydoc Control::OnRelayout()
-   */
-  virtual void OnRelayout( const Vector2& size, ActorSizeContainer& container );
-
-  void AddLabel( Toolkit::TextLabel label );
-
-private:
-  // Undefined copy constructor and assignment operators
-  VerticalLayout(const VerticalLayout&);
-  VerticalLayout& operator=(const VerticalLayout& rhs);
-};
-
-} // namespace Internal
-
-} // namespace Toolkit
-
-} // namespace Dali
-
-#endif // __DALI_DEMO_VERTICAL_LAYOUT_IMPL_H__
-/*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// CLASS HEADER
-#include "vertical-layout.h"
-
-// INTERNAL INCLUDES
-#include "vertical-layout-impl.h"
-
-namespace Dali
-{
-
-namespace Toolkit
-{
-
-VerticalLayout VerticalLayout::New()
-{
-  return Internal::VerticalLayout::New();
-}
-
-VerticalLayout::VerticalLayout()
-{
-}
-
-VerticalLayout::VerticalLayout( const VerticalLayout& handle )
-: Control( handle )
-{
-}
-
-VerticalLayout& VerticalLayout::operator=( const VerticalLayout& handle )
-{
-  if( &handle != this )
-  {
-    Control::operator=( handle );
-  }
-  return *this;
-}
-
-VerticalLayout VerticalLayout::DownCast( BaseHandle handle )
-{
-  return Control::DownCast<VerticalLayout, Internal::VerticalLayout>( handle );
-}
-
-VerticalLayout::~VerticalLayout()
-{
-}
-
-VerticalLayout::VerticalLayout( Internal::VerticalLayout& internal )
-: Control( internal )
-{
-}
-
-VerticalLayout::VerticalLayout( Dali::Internal::CustomActor* internal )
-: Control( internal )
-{
-}
-
-void VerticalLayout::AddLabel( TextLabel label )
-{
-  GetImpl( *this ).AddLabel( label );
-}
-
-Internal::VerticalLayout& VerticalLayout::GetImpl( VerticalLayout& verticalLayout )
-{
-  DALI_ASSERT_ALWAYS( verticalLayout );
-
-  Dali::RefObject& handle = verticalLayout.GetImplementation();
-
-  return static_cast<Internal::VerticalLayout&>(handle);
-}
-
-} // namespace Toolkit
-
-} // namespace Dali
-#ifndef __DALI_DEMO_VERTICAL_LAYOUT_H__
-#define __DALI_DEMO_VERTICAL_LAYOUT_H__
-
-/*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// EXTERNAL INCLUDES
-#include <dali-toolkit/dali-toolkit.h>
-
-namespace Dali
-{
-
-namespace Toolkit
-{
-
-namespace Internal
-{
-class VerticalLayout;
-} // namespace Internal
-
-class VerticalLayout : public Toolkit::Control
-{
-public:
-  static VerticalLayout New();
-
-  VerticalLayout();
-
-  VerticalLayout( const VerticalLayout& handle );
-
-  VerticalLayout& operator=( const VerticalLayout& handle );
-
-  ~VerticalLayout();
-
-  VerticalLayout( Internal::VerticalLayout& internal );
-
-  explicit VerticalLayout( Dali::Internal::CustomActor* internal );
-
-  VerticalLayout DownCast( BaseHandle handle );
-
-  void AddLabel( TextLabel label );
-
-  Internal::VerticalLayout& GetImpl( VerticalLayout& verticalLayout );
-
-private:
-};
-
-} // namespace Toolkit
-
-} // namespace Dali
-
-#endif // __DALI_DEMO_VERTICAL_LAYOUT_H__
-/*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// CLASS HEADER
-#include "center-layout-impl.h"
-
-// INTERNAL INCLUDES
-#include "center-layout.h"
-
-namespace
-{
-  int ConvertToEven(int value)
-  {
-    return (value % 2 == 0) ? value : (value + 1);
-  }
-}
-
-namespace Dali
-{
-
-namespace Toolkit
-{
-
-namespace Internal
-{
-
-Toolkit::CenterLayout CenterLayout::New()
-{
-  // Create the implementation, temporarily owned by this handle on stack
-  IntrusivePtr< CenterLayout > impl = new CenterLayout();
-
-  // Pass ownership to CustomActor handle
-  Toolkit::CenterLayout handle( *impl );
-
-  // Second-phase init of the implementation
-  // This can only be done after the CustomActor connection has been made...
-  impl->Initialize();
-
-  return handle;
-}
-
-CenterLayout::CenterLayout()
-: Control( ControlBehaviour( CONTROL_BEHAVIOUR_NONE ) )
-{
-}
-
-CenterLayout::~CenterLayout()
-{
-}
-
-void CenterLayout::OnInitialize()
-{
-  CustomActor self = Self();
-
-  // Move background behind text label
-  Dali::Toolkit::Control::DownCast( self ).SetBackgroundColor( Vector4(0.1f,0.1f,0.1f,1.0f) );
-  self.GetChildAt(0).SetZ(-1.0f);
-
-  Stage stage = Stage::GetCurrent();
-  Vector2 stageSize = stage.GetSize();
-
-  // Resize the center layout when the corner is grabbed
-  mGrabCorner = CreateSolidColorActor( Color::GREEN );
-  mGrabCorner.SetAnchorPoint( AnchorPoint::BOTTOM_RIGHT );
-  mGrabCorner.SetParentOrigin( ParentOrigin::BOTTOM_RIGHT );
-  mGrabCorner.SetSize( stageSize.width*0.1f, stageSize.width*0.1f );
-  mGrabCorner.SetZ(1.0f);
-  self.Add( mGrabCorner );
-
-  mPanGestureDetector = PanGestureDetector::New();
-  mPanGestureDetector.Attach( mGrabCorner );
-  mPanGestureDetector.DetectedSignal().Connect( this, &CenterLayout::OnPan );
-}
-
-void CenterLayout::OnRelayout( const Vector2& size, ActorSizeContainer& container )
-{
-  CustomActor self = Self();
-
-  if( mLayoutSize.x <= 0.0f )
-  {
-    mLayoutSize = size;
-  }
-
-  for( unsigned int i=0; i<self.GetChildCount(); ++i )
-  {
-    Dali::Toolkit::Control child = Dali::Toolkit::Control::DownCast( self.GetChildAt(i) );
-
-    if( child )
-    {
-      child.SetParentOrigin( ParentOrigin::TOP_CENTER );
-      child.SetAnchorPoint( AnchorPoint::TOP_CENTER );
-
-      const Size childSize( size );
-      child.SetSize( size );
-
-      container.push_back( ActorSizePair( child, childSize ) );
-    }
-  }
-}
-
-void CenterLayout::OnPan( Actor actor, const PanGesture& gesture )
-{
-  mLayoutSize.x += gesture.displacement.x * 2.0f;
-  mLayoutSize.y += gesture.displacement.y * 2.0f;
-
-  if( mLayoutSize.x >= 2.0f &&
-      mLayoutSize.y >= 2.0f )
-  {
-    // Avoid pixel mis-alignment issue
-    Vector2 clampedSize = Vector2( ConvertToEven(static_cast<int>(mLayoutSize.x)),
-                                   ConvertToEven(static_cast<int>(mLayoutSize.y)) );
-
-    Self().SetSize( clampedSize );
-
-    RelayoutRequest();
-  }
-}
-
-} // namespace Internal
-
-} // namespace Toolkit
-
-} // namespace Dali
-#ifndef __DALI_DEMO_CENTER_LAYOUT_IMPL_H__
-#define __DALI_DEMO_CENTER_LAYOUT_IMPL_H__
-
-/*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// INTERNAL INCLUDES
-#include "center-layout.h"
-
-namespace Dali
-{
-
-namespace Toolkit
-{
-
-namespace Internal
-{
-
-class CenterLayout : public Control
-{
-public:
-  /**
-   * @copydoc Dali::Toollkit::TextLabel::New()
-   */
-  static Toolkit::CenterLayout New();
-
-  CenterLayout();
-
-  virtual ~CenterLayout();
-
-  /**
-   * @copydoc Control::OnInitialize()
-   */
-  virtual void OnInitialize();
-
-  // Size negotiation methods inherited from Internal::Control
-
-  /**
-   * @copydoc Control::OnRelayout()
-   */
-  virtual void OnRelayout( const Vector2& size, ActorSizeContainer& container );
-
-private:
-
-  void OnPan( Actor actor, const PanGesture& gesture );
-
-  // Undefined copy constructor and assignment operators
-  CenterLayout(const CenterLayout&);
-  CenterLayout& operator=(const CenterLayout& rhs);
-
-private:
-
-  Vector3 mLayoutSize;
-
-  Actor mGrabCorner;
-
-  PanGestureDetector mPanGestureDetector;
-};
-
-} // namespace Internal
-
-} // namespace Toolkit
-
-} // namespace Dali
-
-#endif // __DALI_DEMO_CENTER_LAYOUT_IMPL_H__
-/*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// CLASS HEADER
-#include "center-layout.h"
-
-// INTERNAL INCLUDES
-#include "center-layout-impl.h"
-
-namespace Dali
-{
-
-namespace Toolkit
-{
-
-CenterLayout CenterLayout::New()
-{
-  return Internal::CenterLayout::New();
-}
-
-CenterLayout::CenterLayout()
-{
-}
-
-CenterLayout::CenterLayout( const CenterLayout& handle )
-: Control( handle )
-{
-}
-
-CenterLayout& CenterLayout::operator=( const CenterLayout& handle )
-{
-  if( &handle != this )
-  {
-    Control::operator=( handle );
-  }
-  return *this;
-}
-
-CenterLayout CenterLayout::DownCast( BaseHandle handle )
-{
-  return Control::DownCast<CenterLayout, Internal::CenterLayout>( handle );
-}
-
-CenterLayout::~CenterLayout()
-{
-}
-
-CenterLayout::CenterLayout( Internal::CenterLayout& internal )
-: Control( internal )
-{
-}
-
-CenterLayout::CenterLayout( Dali::Internal::CustomActor* internal )
-: Control( internal )
-{
-}
-
-Internal::CenterLayout& CenterLayout::GetImpl( CenterLayout& verticalLayout )
-{
-  DALI_ASSERT_ALWAYS( verticalLayout );
-
-  Dali::RefObject& handle = verticalLayout.GetImplementation();
-
-  return static_cast<Internal::CenterLayout&>(handle);
-}
-
-} // namespace Toolkit
-
-} // namespace Dali
-#ifndef __DALI_DEMO_CENTER_LAYOUT_H__
-#define __DALI_DEMO_CENTER_LAYOUT_H__
-
-/*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// EXTERNAL INCLUDES
-#include <dali-toolkit/dali-toolkit.h>
-
-namespace Dali
-{
-
-namespace Toolkit
-{
-
-namespace Internal
-{
-class CenterLayout;
-} // namespace Internal
-
-class CenterLayout : public Toolkit::Control
-{
-public:
-  static CenterLayout New();
-
-  CenterLayout();
-
-  CenterLayout( const CenterLayout& handle );
-
-  CenterLayout& operator=( const CenterLayout& handle );
-
-  ~CenterLayout();
-
-  CenterLayout( Internal::CenterLayout& internal );
-
-  explicit CenterLayout( Dali::Internal::CustomActor* internal );
-
-  CenterLayout DownCast( BaseHandle handle );
-
-  Internal::CenterLayout& GetImpl( CenterLayout& verticalLayout );
-
-private:
-};
-
-} // namespace Toolkit
-
-} // namespace Dali
-
-#endif // __DALI_DEMO_CENTER_LAYOUT_H__
@@ -25,7 +25,6 @@
 #include <dali/public-api/text-abstraction/text-abstraction.h>
 // INTERNAL INCLUDES
-#include "center-layout.h"
 #include "shared/multi-language-strings.h"
 using namespace Dali;
@@ -34,6 +33,8 @@ using namespace MultiLanguageStrings;
 namespace
 {
+  const char* const BACKGROUND_IMAGE = DALI_IMAGE_DIR "button-up.9.png";
+
   const unsigned int KEY_ZERO = 10;
   const unsigned int KEY_ONE = 11;
   const unsigned int KEY_H = 43;
@@ -61,6 +62,11 @@ namespace
   };
   const unsigned int V_ALIGNMENT_STRING_COUNT = sizeof( V_ALIGNMENT_STRING_TABLE ) / sizeof( V_ALIGNMENT_STRING_TABLE[0u] );
+
+  int ConvertToEven(int value)
+  {
+    return (value % 2 == 0) ? value : (value + 1);
+  }
 }
 /**
@@ -91,28 +97,63 @@ public:
   {
     Stage stage = Stage::GetCurrent();
-    stage.SetBackgroundColor( Color::BLACK );
     stage.KeyEventSignal().Connect(this, &TextLabelExample::OnKeyEvent);
     Vector2 stageSize = stage.GetSize();
-    CenterLayout centerLayout = CenterLayout::New();
-    centerLayout.SetParentOrigin( ParentOrigin::CENTER );
-    centerLayout.SetSize( stageSize.width*0.6f, stageSize.width*0.6f );
-    stage.Add( centerLayout );
-
-    mLabel = TextLabel::New();
-    mLabel.SetBackgroundColor( Vector4(0.3f,0.3f,0.6f,1.0f) );
-    centerLayout.Add( mLabel );
-
+    mContainer = Control::New();
+    mContainer.SetName( "Container" );
+    mContainer.SetParentOrigin( ParentOrigin::CENTER );
+    mContainer.SetResizePolicy( FIXED, ALL_DIMENSIONS );
+    mLayoutSize = Vector2(stageSize.width*0.6f, stageSize.width*0.6f);
+    mContainer.SetPreferredSize( mLayoutSize );
+    mContainer.SetBackgroundImage( ResourceImage::New( BACKGROUND_IMAGE ) );
+    mContainer.GetChildAt(0).SetZ(-1.0f);
+    stage.Add( mContainer );
+
+    // Resize the center layout when the corner is grabbed
+    mGrabCorner = Control::New();
+    mGrabCorner.SetName( "GrabCorner" );
+    mGrabCorner.SetAnchorPoint( AnchorPoint::BOTTOM_RIGHT );
+    mGrabCorner.SetParentOrigin( ParentOrigin::BOTTOM_RIGHT );
+    mGrabCorner.SetResizePolicy( FIXED, ALL_DIMENSIONS );
+    mGrabCorner.SetPreferredSize( Vector2(stageSize.width*0.1f, stageSize.width*0.1f) );
+    mGrabCorner.SetZ(1.0f);
+    mContainer.Add( mGrabCorner );
+
+    mPanGestureDetector = PanGestureDetector::New();
+    mPanGestureDetector.Attach( mGrabCorner );
+    mPanGestureDetector.DetectedSignal().Connect( this, &TextLabelExample::OnPan );
+
+    mLabel = TextLabel::New( "A Quick Brown Fox Jumps Over The Lazy Dog" );
+    mLabel.SetName( "TextLabel" );
+    mLabel.SetAnchorPoint( AnchorPoint::TOP_LEFT );
+    mLabel.SetResizePolicy( FILL_TO_PARENT, HEIGHT );
     mLabel.SetProperty( TextLabel::Property::MULTI_LINE, true );
-    mLabel.SetProperty( TextLabel::Property::TEXT, "A Quick Brown Fox Jumps Over The Lazy Dog" );
     mLabel.SetProperty( TextLabel::Property::SHADOW_OFFSET, Vector2( 1.0f, 1.0f ) );
     mLabel.SetProperty( TextLabel::Property::SHADOW_COLOR, Color::BLACK );
+    mContainer.Add( mLabel );
     Property::Value labelText = mLabel.GetProperty( TextLabel::Property::TEXT );
     std::cout << "Displaying text: \"" << labelText.Get< std::string >() << "\"" << std::endl;
   }
+  // Resize the text-label with pan gesture
+  void OnPan( Actor actor, const PanGesture& gesture )
+  {
+    mLayoutSize.x += gesture.displacement.x * 2.0f;
+    mLayoutSize.y += gesture.displacement.y * 2.0f;
+
+    if( mLayoutSize.x >= 2.0f &&
+        mLayoutSize.y >= 2.0f )
+    {
+      // Avoid pixel mis-alignment issue
+      Vector2 clampedSize = Vector2( ConvertToEven(static_cast<int>(mLayoutSize.x)),
+                                     ConvertToEven(static_cast<int>(mLayoutSize.y)) );
+
+      mContainer.SetPreferredSize( clampedSize );
+    }
+  }
+
   /**
    * Main key event handler
    */
@@ -206,6 +247,13 @@ private:
   TextLabel mLabel;
+  Control mContainer;
+  Actor mGrabCorner;
+
+  PanGestureDetector mPanGestureDetector;
+
+  Vector2 mLayoutSize;
+
   unsigned int mLanguageId;
   unsigned int mAlignment;
 };
@@ -2,7 +2,7 @@
 Name:       com.samsung.dali-demo
 Summary:    The OpenGLES Canvas Core Demo
-Version:    1.0.34
+Version:    1.0.35
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0
@@ -3,6 +3,7 @@
     {
       "type": "ImageActor",
       "name": "On",
+      "relayout-enabled": false,
       "position": [
         374,
         215,
@@ -11,7 +12,7 @@
       "size": [
         144,
         144,
-        1
+	1
       ],
       "sizeAspectRatio": false,
       "color": [
@@ -33,6 +34,7 @@
     {
       "type": "ImageActor",
       "name": "Off",
+      "relayout-enabled": false,
       "position": [
         129,
         215,
@@ -41,7 +43,7 @@
       "size": [
         144,
         144,
-        1
+	1
       ],
       "sizeAspectRatio": false,
       "color": [
@@ -63,6 +65,7 @@
     {
       "type": "ImageActor",
       "name": "Right",
+      "relayout-enabled": false,
       "position": [
         418.5,
         214.5,
@@ -71,7 +74,7 @@
       "size": [
         85,
         161,
-        1
+	1
       ],
       "sizeAspectRatio": false,
       "visible": true,
@@ -94,6 +97,7 @@
     {
       "type": "ImageActor",
       "name": "Left",
+      "relayout-enabled": false,
       "position": [
         331,
         214.5,
@@ -102,7 +106,7 @@
       "size": [
         88,
         161,
-        1
+	1
       ],
       "sizeAspectRatio": false,
       "visible": true,
@@ -125,6 +129,7 @@
     {
       "type": "ImageActor",
       "name": "Middle",
+      "relayout-enabled": false,
       "position": [
         375.5,
         214.5,
@@ -138,7 +143,7 @@
       "size": [
         1,
         161,
-        1
+	1
       ],
       "sizeAspectRatio": false,
       "color": [
@@ -160,6 +165,7 @@
     {
       "type": "ImageActor",
       "name": "Jelly",
+      "relayout-enabled": false,
       "position": [
         374,
         215,
@@ -168,7 +174,7 @@
       "size": [
         144,
         144,
-        1
+	1
       ],
       "sizeAspectRatio": false,
       "color": [
@@ -190,6 +196,7 @@
     {
       "type": "Control",
       "name": "Left Black",
+      "relayout-enabled": false,
       "position": [
         144.5,
         218.5,
@@ -198,7 +205,7 @@
       "size": [
         275,
         243,
-        1
+	1
       ],
       "sizeAspectRatio": false,
       "background-color": [
@@ -218,6 +225,7 @@
     {
       "type": "Control",
       "name": "Right Black",
+      "relayout-enabled": false,
       "position": [
         629.5,
         218.5,
@@ -226,7 +234,7 @@
       "size": [
         335,
         243,
-        1
+	1
       ],
       "sizeAspectRatio": false,
       "background-color": [
@@ -246,6 +254,7 @@
     {
       "type": "ImageActor",
       "name": "JellyOff",
+      "relayout-enabled": false,
       "position": [
         121,
         -117,
@@ -254,7 +263,7 @@
       "size": [
         144,
         144,
-        1
+	1
       ],
       "sizeAspectRatio": false,
       "color": [
@@ -276,6 +285,7 @@
     {
       "type": "Control",
       "name": "Control On",
+      "relayout-enabled": false,
       "position": [
         371.26116838487997,
         217.33333333333331,
@@ -284,7 +294,7 @@
       "size": [
         196,
         184,
-        1
+	1
       ],
       "sizeAspectRatio": false,
       "scale": [
@@ -310,6 +320,7 @@
     {
       "type": "Control",
       "name": "Control Off",
+      "relayout-enabled": false,
       "position": [
         123.5,
         -117,
@@ -318,7 +329,7 @@
       "size": [
         193,
         182,
-        1
+	1
       ],
       "sizeAspectRatio": false,
       "color": [
@@ -18,9 +18,11 @@
   "stage": [
     {
       "type": "Control",
+      "relayout-enabled": false,
       "actors": [
         {
           "type": "Control",
+	  "relayout-enabled": true,
           "actors": [],
           "name": "Control 8",
           "position": [
@@ -60,9 +62,11 @@
         },
         {
           "type": "Control",
+	  "relayout-enabled": false,
           "actors": [
             {
               "type": "Control",
+	      "relayout-enabled": false,
               "actors": [],
               "name": "Container 2",
               "position": [
@@ -102,9 +106,11 @@
             },
             {
               "type": "Control",
+	      "relayout-enabled": false,
               "actors": [
                 {
                   "type": "Control",
+		  "relayout-enabled": false,
                   "actors": [],
                   "name": "Container 4",
                   "position": [
@@ -181,9 +187,11 @@
             },
             {
               "type": "Control",
+	      "relayout-enabled": false,
               "actors": [
                 {
                   "type": "Control",
+		  "relayout-enabled": false,
                   "actors": [],
                   "name": "Container 5",
                   "position": [
@@ -223,9 +231,11 @@
                 },
                 {
                   "type": "Control",
+		  "relayout-enabled": false,
                   "actors": [
                     {
                       "type": "Control",
+		      "relayout-enabled": false,
                       "actors": [],
                       "name": "Container 7",
                       "position": [
@@ -302,9 +312,11 @@
                 },
                 {
                   "type": "Control",
+		  "relayout-enabled": false,
                   "actors": [
                     {
                       "type": "Control",
+		      "relayout-enabled": false,
                       "actors": [],
                       "name": "Container 8",
                       "position": [
@@ -344,9 +356,11 @@
                     },
                     {
                       "type": "Control",
+		      "relayout-enabled": false,
                       "actors": [
                         {
                           "type": "Control",
+			  "relayout-enabled": false,
                           "actors": [],
                           "name": "Container 10",
                           "position": [
@@ -534,9 +548,11 @@
         },
         {
           "type": "Control",
+	  "relayout-enabled": false,
           "actors": [
             {
               "type": "Control",
+	      "relayout-enabled": false,
               "actors": [],
               "name": "Control 4",
               "position": [
@@ -613,9 +629,11 @@
         },
         {
           "type": "Control",
+	  "relayout-enabled": false,
           "actors": [
             {
               "type": "Control",
+	      "relayout-enabled": false,
               "actors": [
                 {
                   "type": "Control",
@@ -695,6 +713,7 @@
             },
             {
               "type": "Control",
+	      "relayout-enabled": false,
               "actors": [],
               "name": "Container 11",
               "position": [
@@ -734,12 +753,15 @@
             },
             {
               "type": "Control",
+	      "relayout-enabled": false,
               "actors": [
                 {
                   "type": "Control",
+		  "relayout-enabled": false,
                   "actors": [
                     {
                       "type": "Control",
+		      "relayout-enabled": false,
                       "actors": [],
                       "name": "Container 15",
                       "position": [
@@ -816,6 +838,7 @@
                 },
                 {
                   "type": "Control",
+		  "relayout-enabled": false,
                   "actors": [],
                   "name": "Container 16",
                   "position": [
@@ -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": [{
@@ -29,6 +29,7 @@
     // A container with a yellow background
     {
       "type": "Control",
+      "relayout-enabled": false,
       "parent-origin": "CENTER",
       "anchor-point": "BOTTOM_CENTER",
       "background-color": [1, 1, 0, 1],
@@ -38,10 +39,11 @@
     // A container with an image
     {
       "type": "Control",
+      "relayout-enabled": false,
       "parent-origin": "CENTER",
       "anchor-point": "TOP_CENTER",
       "size": [400, 150, 1],
-      "background": {
+      "background-image": {
         "image": {
           "filename": "{DALI_IMAGE_DIR}button-background.png"
         }
@@ -51,11 +53,12 @@
     // A container with the same image blended in with a blue background
     {
       "type": "Control",
+      "relayout-enabled": false,
       "parent-origin": "BOTTOM_CENTER",
       "anchor-point": "BOTTOM_CENTER",
       "size": [400, 150, 1],
       "background-color": [0, 0, 1, 1],
-      "background": {
+      "background-image": {
         "image": {
           "filename": "{DALI_IMAGE_DIR}button-background.png"
         }
+// Image Wall example
+//
+// Example usage of Dali API
+//
+//
+//
+// get the dali-demo image directory path
+// hard code for the device to /usr/apps/com.samsung.dali-demo/images/
+var imageDir = dali.DALI_DATA_DIRECTORY;
+
+if (imageDir != "/usr/share/dali//") {
+    imageDir = imageDir.substring(0, imageDir.lastIndexOf("dali/"));
+    imageDir += "com.samsung.dali-demo/images/";
+} else // on device
+{
+    imageDir = "/usr/apps/com.samsung.dali-demo/images/";
+}
+
+
+var NUMBER_OF_IMAGES = 40; // for now use 16 ( demo files go up to 30)
+var DEMO_IMAGES = []; // array to store Dali Images
+var VIDEO_WALL_ACTORS = []; // array to store Image actors
+var VIDEO_WALL_ROWS = 7; // use 3 rows for the video wall
+var VIDEO_WALL_COLUMNS = 12; // use 12 columns for the video wall
+var VIDEO_WALL_TOTAL_ITEMS = VIDEO_WALL_COLUMNS * VIDEO_WALL_ROWS; // total items
+var VIDEO_WALL_ITEM_SIZE = 128; // width / height of a item in the video wall
+var BORDER_SIZE = 5;
+var VIDEO_WALL_ITEM_SIZE_NO_BORDER = VIDEO_WALL_ITEM_SIZE - BORDER_SIZE;
+var VIDEO_WALL_WIDTH = VIDEO_WALL_COLUMNS * VIDEO_WALL_ITEM_SIZE;
+var VIDEO_WALL_HEIGHT = VIDEO_WALL_ROWS * VIDEO_WALL_ITEM_SIZE;
+
+var daliApp = {};
+
+var wallRootActor; // the root actor of the video wall
+
+// we want demo images of format gallery-small-1.jpg
+daliApp.getFileName = function(index) {
+    fileName = "gallery-small-" + (index+1) + ".jpg";
+    return fileName;
+}
+
+// load the images
+daliApp.loadImages = function() {
+    for (index = 0; index < NUMBER_OF_IMAGES; ++index) {
+        fileName = imageDir + daliApp.getFileName(index);
+        DEMO_IMAGES[index] = new dali.ResourceImage( { url:fileName } );
+    }
+}
+
+daliApp.createRootActor = function() {
+    wallRootActor = new dali.Actor();
+    wallRootActor.parentOrigin = dali.CENTER;
+    wallRootActor.anchorPoint = dali.CENTER;
+    dali.stage.add(wallRootActor);
+}
+
+
+
+daliApp.getWallActorIndex = function(x, y) {
+    return x + y * VIDEO_WALL_COLUMNS;
+}
+
+daliApp.createActors = function() {
+    daliApp.createRootActor();
+
+    for (y = 0; y < VIDEO_WALL_ROWS; ++y) {
+        for (x = 0; x < VIDEO_WALL_COLUMNS; ++x) {
+
+            var actorIndex = daliApp.getWallActorIndex(x, y);
+            var imageActor = new dali.ImageActor();
+
+            // wrap image index between 0 and NUMBER_OF_IMAGES
+            var imageIndex = actorIndex % NUMBER_OF_IMAGES;
+
+            imageActor.setImage(DEMO_IMAGES[imageIndex]);
+
+            imageActor.parentOrigin = dali.CENTER;
+            imageActor.anchorPoint = dali.CENTER;
+            imageActor.size = [VIDEO_WALL_ITEM_SIZE_NO_BORDER, VIDEO_WALL_ITEM_SIZE_NO_BORDER, 1.0]; // start with zero size so it zooms up
+
+            var xPosition = x * VIDEO_WALL_ITEM_SIZE;
+            //  as the middle the wall is at zero (relative to wallRootActor), we need to subtract half the wall width.
+            // + add half item size because the item anchor point is the center of the wallRootActor.
+            xPosition = xPosition - (VIDEO_WALL_WIDTH / 2) + (VIDEO_WALL_ITEM_SIZE / 2);
+
+            var yPosition = y * VIDEO_WALL_ITEM_SIZE;
+            yPosition = yPosition - (VIDEO_WALL_HEIGHT / 2) + (VIDEO_WALL_ITEM_SIZE / 2);
+
+            imageActor.position = [xPosition, yPosition, 0.0];
+            // store the actor
+            VIDEO_WALL_ACTORS[actorIndex] = imageActor;
+
+            // Add to the video wall root actor.
+            wallRootActor.add(imageActor);
+        }
+    }
+}
+
+function Initialise() {
+
+    daliApp.loadImages();
+
+    daliApp.createActors();
+
+
+}
+
+Initialise();
@@ -66,10 +66,12 @@ Dali::Layer CreateToolbar( Dali::Toolkit::ToolBar&amp; toolBar,
   Dali::Stage stage = Dali::Stage::GetCurrent();
   Dali::Layer toolBarLayer = Dali::Layer::New();
+  toolBarLayer.SetName( "TOOLBAR_LAYER" );
   toolBarLayer.SetAnchorPoint( Dali::AnchorPoint::TOP_CENTER );
   toolBarLayer.SetParentOrigin( Dali::ParentOrigin::TOP_CENTER );
-  toolBarLayer.ApplyConstraint( Dali::Constraint::New<Dali::Vector3>( Dali::Actor::Property::SIZE, Dali::ParentSource( Dali::Actor::Property::SIZE ), Dali::SourceWidthFixedHeight( style.mToolBarHeight  ) ) );
-  toolBarLayer.SetSize( 0.0f, style.mToolBarHeight );
+  toolBarLayer.SetPreferredSize( Dali::Vector2( 0.0f, style.mToolBarHeight ) );
+  toolBarLayer.SetResizePolicy( Dali::FILL_TO_PARENT, Dali::WIDTH );
+  toolBarLayer.SetResizePolicy( Dali::FIXED, Dali::HEIGHT );
   // Raise tool bar layer to the top.
   toolBarLayer.RaiseToTop();
@@ -77,12 +79,14 @@ Dali::Layer CreateToolbar( Dali::Toolkit::ToolBar&amp; toolBar,
   // Tool bar
   Dali::Image image = Dali::ResourceImage::New( toolbarImagePath );
   Dali::ImageActor toolBarBackground = Dali::ImageActor::New( image );
+  toolBarBackground.SetName( "TOOLBAR_BACKGROUND" );
+  toolBarBackground.SetResizePolicy( Dali::FILL_TO_PARENT, Dali::ALL_DIMENSIONS );
   toolBar = Dali::Toolkit::ToolBar::New();
+  toolBar.SetName( "TOOLBAR" );
   toolBar.SetBackground( toolBarBackground );
   toolBar.SetParentOrigin( Dali::ParentOrigin::TOP_CENTER );
   toolBar.SetAnchorPoint( Dali::AnchorPoint::TOP_CENTER );
-  toolBar.SetSize( 0.0f, style.mToolBarHeight );
-  toolBar.SetSizeMode( Dali::SIZE_EQUAL_TO_PARENT );
+  toolBar.SetResizePolicy( Dali::FILL_TO_PARENT, Dali::ALL_DIMENSIONS );
   toolBarBackground.SetSortModifier(1.0f);
   // Add the tool bar to the too bar layer.
@@ -118,6 +122,7 @@ Dali::Layer CreateView( Dali::Application&amp; application,
   // Create default View.
   view = Dali::Toolkit::View::New();
+  view.SetResizePolicy( Dali::FILL_TO_PARENT, Dali::ALL_DIMENSIONS );
   // Add the view to the stage before setting the background.
   stage.Add( view );
@@ -144,13 +149,11 @@ Dali::Layer CreateView( Dali::Application&amp; application,
   // Add tool bar layer to the view.
   view.AddContentLayer( toolBarLayer );
-
-
   // Create a content layer.
   Dali::Layer contentLayer = Dali::Layer::New();
   contentLayer.SetAnchorPoint( Dali::AnchorPoint::CENTER );
   contentLayer.SetParentOrigin( Dali::ParentOrigin::CENTER );
-  contentLayer.SetSizeMode( Dali::SIZE_EQUAL_TO_PARENT );
+  contentLayer.SetResizePolicy( Dali::FILL_TO_PARENT, Dali::ALL_DIMENSIONS );
   view.AddContentLayer( contentLayer );
   contentLayer.LowerBelow( toolBarLayer );