Merge branch 'tizen' into devel/new_mesh

Change-Id: I12978fe6e331f545fbdf7d9ba045a183d0ae1376

Merge branch 'tizen' into devel/new_mesh
Change-Id: I12978fe6e331f545fbdf7d9ba045a183d0ae1376
David Steele
2 parents 1a1d0dc7 1d5b074a
Showing 34 changed files with 2640 additions and 325 deletions
README
com.samsung.dali-demo.xml
demo/dali-demo.cpp
demo/dali-table-view.cpp
demo/dali-table-view.h
examples/atlas/atlas-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/dissolve-effect/dissolve-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/motion-blur/motion-blur-example.cpp
examples/motion-stretch/motion-stretch-example.cpp
examples/page-turn-view/page-turn-view-example.cpp
@@ -39,7 +39,7 @@ T.O.C.
 To build the repository enter the 'build/tizen' folder:
- cd dali-toolkit/build/tizen
+ cd dali-demo/build/tizen
 Then run the following commands:
@@ -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-view.example" exec="/usr/apps/com.samsung.dali-demo/bin/text-view.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
 		<label>Text View</label>
@@ -82,4 +85,10 @@
 	<ui-application appid="path-animation.example" exec="/usr/apps/com.samsung.dali-demo/bin/path-animation.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
 		<label>Path Animation</label>
 	</ui-application>
+	<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>
@@ -39,11 +39,15 @@ int main(int argc, char **argv)
   demo.AddExample(Example("refraction-effect.example", "Refraction"));
   demo.AddExample(Example("scroll-view.example", "Scroll View"));
   demo.AddExample(Example("shadow-bone-lighting.example", "Lights and shadows"));
-  demo.AddExample(Example("builder.example", "Script Based UI"));
+//  demo.AddExample(Example("builder.example", "Script Based UI"));
   demo.AddExample(Example("image-scaling-irregular-grid.example", "Image Scaling Modes"));
   demo.AddExample(Example("text-view.example", "Text View"));
   demo.AddExample(Example("animated-shapes.example", "Animated Shapes"));
   demo.AddExample(Example("path-animation.example", "Path Animation"));
+  demo.AddExample(Example("size-negotiation.example", "Size Negotiation"));
+
+  demo.SortAlphabetically( true );
+
   app.MainLoop();
   return 0;
@@ -55,10 +55,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
@@ -75,7 +75,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;
@@ -124,10 +123,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;
 }
@@ -139,7 +139,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
 {
@@ -154,15 +154,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;
   }
@@ -181,11 +181,35 @@ bool CompareByTitle( const Example&amp; lhs, const Example&amp; rhs )
 } // namespace
 DaliTableView::DaliTableView( Application& application )
-    : mApplication( application ),
-        mScrolling( false ),
-        mBackgroundImagePath( DEFAULT_BACKGROUND_IMAGE_PATH ),
-        mSortAlphabetically( false ),
-        mBackgroundAnimsPlaying( false )
+: mApplication( application ),
+  mBackgroundLayer(),
+  mRootActor(),
+  mRotateAnimation(),
+  mBackground(),
+  mPressedAnimation(),
+  mScrollViewLayer(),
+  mScrollView(),
+  mScrollViewEffect(),
+  mScrollRulerX(),
+  mScrollRulerY(),
+  mButtons(),
+  mPressedActor(),
+  mAnimationTimer(),
+  mLogoTapDetector(),
+  mVersionPopup(),
+  mButtonsPageRelativeSize(),
+  mPages(),
+  mTableViewImages(),
+  mBackgroundActors(),
+  mBackgroundAnimations(),
+  mExampleList(),
+  mExampleMap(),
+  mBackgroundImagePath( DEFAULT_BACKGROUND_IMAGE_PATH ),
+  mTotalPages(),
+  mScrolling( false ),
+  mSortAlphabetically( false ),
+  mBackgroundAnimsPlaying( false ),
+  mVersionPopupShown( false )
 {
   application.InitSignal().Connect( this, &DaliTableView::Initialize );
 }
@@ -217,15 +241,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
@@ -237,32 +260,42 @@ void DaliTableView::Initialize( Application&amp; application )
                                                        DemoHelper::GetDefaultTextStyle());
   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( 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 );
@@ -272,12 +305,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();
@@ -303,7 +361,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();
@@ -319,12 +377,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 );
@@ -332,6 +388,12 @@ void DaliTableView::ApplyCubeEffectToActors()
     }
   }
 }
+
+void DaliTableView::OnButtonsPageRelayout( const Dali::Actor& actor )
+{
+
+}
+
 void DaliTableView::Populate()
 {
   const Vector2 stageSize = Stage::GetCurrent().GetSize();
@@ -352,20 +414,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++)
       {
@@ -373,7 +430,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,
@@ -382,12 +439,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++;
@@ -404,7 +458,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 );
@@ -417,9 +471,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 );
@@ -453,12 +507,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 )
@@ -468,16 +526,17 @@ 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 );
   }
@@ -488,22 +547,23 @@ Actor DaliTableView::CreateTile( const std::string&amp; name, const std::string&amp; tit
   text.SetMultilinePolicy( Toolkit::TextView::SplitByWord );
   text.SetLineJustification( Toolkit::TextView::Center );
   text.SetTextAlignment( Toolkit::Alignment::Type( Alignment::HorizontalCenter | Alignment::VerticalCenter ) );
-  text.SetColor( Color::WHITE );
   text.SetZ( 1 );
   // make the text 90% of tile
-  text.SetSize( 0.9f * parentSize.width, 0.9f * parentSize.height );
+  text.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
+  text.SetSizeMode( SIZE_RELATIVE_TO_PARENT );
+  text.SetSizeModeFactor( Vector3( 0.9f, 0.9f, 0.0f ) );
   text.SetStyleToCurrentText( GetTableTextStyle() );
   text.SetSnapshotModeEnabled( false );
-  tile.Add( text );
+  content.Add( text );
   // 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()
@@ -624,8 +684,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 )
@@ -679,42 +737,77 @@ void DaliTableView::OnKeyEvent( const KeyEvent&amp; event )
   {
     if ( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
     {
-      mApplication.Quit();
+      if ( mVersionPopup && mVersionPopupShown )
+      {
+        HideVersionPopup();
+      }
+      else
+      {
+        mApplication.Quit();
+      }
     }
   }
 }
-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 );
@@ -724,33 +817,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 )
@@ -823,7 +893,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;
 }
@@ -945,4 +1015,49 @@ bool DaliTableView::OnTileHovered( Actor actor, const HoverEvent&amp; event )
   return true;
 }
+void DaliTableView::OnLogoTapped( Dali::Actor actor, const Dali::TapGesture& tap )
+{
+  if ( !mVersionPopupShown )
+  {
+    if ( !mVersionPopup )
+    {
+      std::ostringstream stream;
+      stream << "DALi Core: "    << CORE_MAJOR_VERSION << "." << CORE_MINOR_VERSION << "." << CORE_MICRO_VERSION << std::endl << "(" << CORE_BUILD_DATE << ")" << std::endl << std::endl;
+      stream << "DALi Adaptor: " << ADAPTOR_MAJOR_VERSION << "." << ADAPTOR_MINOR_VERSION << "." << ADAPTOR_MICRO_VERSION << std::endl << "(" << ADAPTOR_BUILD_DATE << ")" << std::endl << std::endl;
+      stream << "DALi Toolkit: " << TOOLKIT_MAJOR_VERSION << "." << TOOLKIT_MINOR_VERSION << "." << TOOLKIT_MICRO_VERSION << std::endl << "(" << TOOLKIT_BUILD_DATE << ")";
+
+      mVersionPopup = Dali::Toolkit::Popup::New();
+      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 );
+
+      mVersionPopup.MarkDirtyForRelayout();
+    }
+
+    mVersionPopup.Show();
+    mVersionPopupShown = true;
+  }
+}
+
+void DaliTableView::HideVersionPopup()
+{
+  if ( mVersionPopup )
+  {
+    mVersionPopup.Hide();
+  }
+}
+void DaliTableView::PopupHidden()
+{
+  if ( mVersionPopup )
+  {
+    mVersionPopupShown = false;
+  }
+}
@@ -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
@@ -360,38 +358,73 @@ private: // Application callbacks &amp; implementation
    */
   void OnFocusedActorActivated( Dali::Actor activatedActor );
+  /**
+   * Called when the logo is tapped
+   *
+   * @param[in]  actor  The tapped actor
+   * @param[in]  tap    The tap information.
+   */
+  void OnLogoTapped( Dali::Actor actor, const Dali::TapGesture& tap );
+
+  /**
+   * Hides the popup
+   */
+  void HideVersionPopup();
+
+  /**
+   * Called when the popup is completely hidden
+   */
+  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.
-  Dali::Layer                     mBackgroundLayer;     ///< Background resides on a separate layer.
-  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)
-  Dali::Toolkit::ScrollViewEffect mScrollViewEffect;    ///< Effect to be applied to the scroll view
-  bool                            mScrolling;           ///< Flag indicating whether view is currently being scrolled
-  Dali::Toolkit::RulerPtr         mScrollRulerX;        ///< ScrollView X (horizontal) ruler
-  Dali::Toolkit::RulerPtr         mScrollRulerY;        ///< ScrollView Y (vertical) ruler
-  Dali::Toolkit::TableView        mButtons;             ///< Navigation buttons
-  ExampleList                     mExampleList;         ///< List of examples.
-  ExampleMap                      mExampleMap;          ///< Map LUT for examples.
-  Dali::ActorContainer            mPages;               ///< List of pages.
-  Dali::Actor                     mPressedActor;        ///< The currently pressed actor.
-  int                             mTotalPages;          ///< Total pages within scrollview.
-  std::string                     mBackgroundImagePath; ///< The path to the background image.
-  bool                            mSortAlphabetically;  ///< Sort examples alphabetically.
-
-  Dali::ActorContainer            mTableViewImages;     ///< Offscreen render of tableview
-  Dali::ActorContainer            mBackgroundActors;    ///< List of background actors used in the effect
-
-  AnimationList                   mBackgroundAnimations;///< List of background bubble animations
-  Dali::Timer                     mAnimationTimer;      ///< Timer used to turn off animation after a specific time period
-  bool                            mBackgroundAnimsPlaying; ///< Are background animations playing
-
-  Dali::Vector3                   mButtonsPageRelativeSize; ///< Size of a buttons page relative to the stage size
+  Dali::Application&              mApplication;              ///< Application instance.
+  Dali::Layer                     mBackgroundLayer;          ///< Background resides on a separate layer.
+  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::Animation                 mPressedAnimation;         ///< Button press scaling animation.
+  Dali::Layer                     mScrollViewLayer;          ///< ScrollView resides on a separate layer.
+  Dali::Toolkit::ScrollView       mScrollView;               ///< ScrollView container (for all Examples)
+  Dali::Toolkit::ScrollViewEffect mScrollViewEffect;         ///< Effect to be applied to the scroll view
+  Dali::Toolkit::RulerPtr         mScrollRulerX;             ///< ScrollView X (horizontal) ruler
+  Dali::Toolkit::RulerPtr         mScrollRulerY;             ///< ScrollView Y (vertical) ruler
+  Dali::Toolkit::TableView        mButtons;                  ///< Navigation buttons
+  Dali::Actor                     mPressedActor;             ///< The currently pressed actor.
+  Dali::Timer                     mAnimationTimer;           ///< Timer used to turn off animation after a specific time period
+  Dali::TapGestureDetector        mLogoTapDetector;          ///< To detect taps on the logo
+  Dali::Toolkit::Popup            mVersionPopup;             ///< Displays DALi library version information
+  Dali::Vector3                   mButtonsPageRelativeSize;  ///< Size of a buttons page relative to the stage size
+
+  Dali::ActorContainer            mPages;                    ///< List of pages.
+  Dali::ActorContainer            mTableViewImages;          ///< Offscreen render of tableview
+  Dali::ActorContainer            mBackgroundActors;         ///< List of background actors used in the effect
+  AnimationList                   mBackgroundAnimations;     ///< List of background bubble animations
+  ExampleList                     mExampleList;              ///< List of examples.
+  ExampleMap                      mExampleMap;               ///< Map LUT for examples.
+
+  std::string                     mBackgroundImagePath;      ///< The path to the background image.
+  int                             mTotalPages;               ///< Total pages within scrollview.
+
+  bool                            mScrolling:1;              ///< Flag indicating whether view is currently being scrolled
+  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__
+/*
+ * 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.
+ *
+ */
+
+#include <dali/dali.h>
+#include "shared/view.h"
+#include <iostream>
+#include <cstdio>
+
+using namespace Dali;
+
+class AtlasController;
+
+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 LOSE_CONTEXT_IMAGE( DALI_IMAGE_DIR "icon-cluster-wobble.png" );
+
+Application gApplication;
+AtlasController* gAtlasController(NULL);
+}
+
+class AtlasController : public ConnectionTracker
+{
+public:
+
+  AtlasController( Application& application )
+  : mApplication( application )
+  {
+    // Connect to the Application's Init signal
+    mApplication.InitSignal().Connect( this, &AtlasController::Create );
+  }
+
+  ~AtlasController()
+  {
+    // Nothing to do here;
+  }
+
+  void Create( Application& application )
+  {
+    // Get a handle to the stage
+    Stage stage = Stage::GetCurrent();
+    stage.SetBackgroundColor(Color::YELLOW);
+
+    // Respond to a click anywhere on the stage
+    stage.KeyEventSignal().Connect(this, &AtlasController::OnKeyEvent);
+
+    mApplication.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
+
+    mContentLayer = DemoHelper::CreateView( mApplication,
+        mView,
+        mToolBar,
+        BACKGROUND_IMAGE,
+        TOOLBAR_IMAGE,
+        "Atlas" );
+
+    mLoseContextButton = Toolkit::PushButton::New();
+    mLoseContextButton.SetBackgroundImage( ResourceImage::New( LOSE_CONTEXT_IMAGE ) );
+    mLoseContextButton.ClickedSignal().Connect( this, &AtlasController::OnLoseContextButtonClicked );
+    mToolBar.AddControl( mLoseContextButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
+
+    mAtlas = Atlas::New( 400,300, Pixel::RGBA8888);
+    mAtlas.Clear(Vector4(0.f,0.5f,0.5f,0.5f));
+    mAtlas.Upload( DALI_IMAGE_DIR "icon-change.png", 50, 30 );
+    mAtlas.Upload( DALI_IMAGE_DIR "icon-cluster-carousel.png", 100, 30 );
+    mAtlas.Upload( DALI_IMAGE_DIR "icon-effects-on.png", 150, 30 );
+    mAtlas.Upload( DALI_IMAGE_DIR "icon-effect-cross.png", 100, 80 );
+    mAtlas.Upload( DALI_IMAGE_DIR "icon-effect-fold.png", 150, 80 );
+    mAtlas.Upload( DALI_IMAGE_DIR "icon-effect-wave.png", 200, 80 );
+    mAtlas.Upload( DALI_IMAGE_DIR "icon-item-view-layout-depth.png", 150, 130 );
+    mAtlas.Upload( DALI_IMAGE_DIR "icon-item-view-layout-grid.png", 200, 130 );
+    mAtlas.Upload( DALI_IMAGE_DIR "icon-item-view-layout-spiral.png", 250, 130 );
+    UploadBufferImages();
+
+    ImageActor imageActor1 = ImageActor::New( mAtlas );
+    imageActor1.SetY(-170.f);
+    imageActor1.SetParentOrigin(ParentOrigin::CENTER);
+    mContentLayer.Add( imageActor1 );
+
+    Atlas atlas2 = Atlas::New( 400,400, Pixel::RGB888);
+    atlas2.Clear( Color::RED );
+    atlas2.Upload( DALI_IMAGE_DIR "gallery-small-1.jpg", 4, 4 );
+    atlas2.Clear( Color::BLUE );
+    atlas2.Upload( DALI_IMAGE_DIR "gallery-small-2.jpg", 136, 4 );
+    atlas2.Upload( DALI_IMAGE_DIR "gallery-small-3.jpg", 268, 4 );
+    atlas2.Upload( DALI_IMAGE_DIR "gallery-small-4.jpg", 4, 136 );
+    atlas2.Upload( DALI_IMAGE_DIR "gallery-small-5.jpg", 136, 136 );
+    atlas2.Upload( DALI_IMAGE_DIR "gallery-small-6.jpg", 268, 135 );
+    atlas2.Upload( DALI_IMAGE_DIR "gallery-small-7.jpg", 4, 268 );
+    atlas2.Upload( DALI_IMAGE_DIR "gallery-small-7.jpg", 136, 268 );
+    atlas2.Upload( DALI_IMAGE_DIR "gallery-small-7.jpg", 268, 268 );
+
+
+    ImageActor imageActor2 = ImageActor::New( atlas2 );
+    imageActor2.SetY(200.f);
+    imageActor2.SetZ(-1.f);
+    imageActor2.SetParentOrigin(ParentOrigin::CENTER);
+    mContentLayer.Add( imageActor2 );
+
+    mPanGestureDetector = PanGestureDetector::New();
+    mPanGestureDetector.DetectedSignal().Connect(this, &AtlasController::OnPanGesture);
+    mPanGestureDetector.Attach(imageActor1);
+    mPanGestureDetector.Attach(imageActor2);
+
+    stage.ContextLostSignal().Connect(this, &AtlasController::OnContextLost);
+    stage.ContextRegainedSignal().Connect(this, &AtlasController::OnContextRegained);
+  }
+
+  void UploadBufferImages()
+  {
+    mAtlas.Upload( CreateBufferImage( Vector4(1.f, 1.f, 1.f, 0.5f  ), 80, 90 ), 0, 210 );
+    mAtlas.Upload( CreateBufferImage( Vector4(1.f, 1.f, 0.75f, 0.5f  ), 80, 80 ), 40, 210 );
+    mAtlas.Upload( CreateBufferImage( Vector4(1.f, 1.f, 0.5f, 0.5f  ), 80, 70 ), 80, 210 );
+    mAtlas.Upload( CreateBufferImage( Vector4(1.f, 1.f, 0.25f, 0.5f  ), 80, 60 ), 120, 210 );
+    mAtlas.Upload( CreateBufferImage( Vector4(1.f, 1.f, 0.f, 0.5f  ), 80, 50 ), 160, 210 );
+    mAtlas.Upload( CreateBufferImage( Vector4(0.75f, 0.75f, 0.f, 0.5f  ), 80, 40 ), 200, 210 );
+    mAtlas.Upload( CreateBufferImage( Vector4(0.5f, 0.5f, 0.f, 0.5f  ), 80, 30 ), 240, 210 );
+    mAtlas.Upload( CreateBufferImage( Vector4(0.25f, 0.25f, 0.f, 0.5f  ), 80, 20 ), 280, 210 );
+    mAtlas.Upload( CreateBufferImage( Vector4(0.1f, 0.1f, 0.f, 0.5f  ), 80, 10 ), 320, 210 );
+    BufferImage redBlock = CreateBufferImage( Color::RED, 40, 40 );
+    mAtlas.Upload(redBlock, 320, 30);
+    mAtlas.Upload(redBlock, 320, 80);
+    mAtlas.Upload(redBlock, 320, 130);
+  }
+
+  static void NewWindow(void)
+  {
+    PositionSize posSize(0, 0, 720, 1280);
+    gApplication.ReplaceWindow(posSize, "NewWindow"); // Generates a new window
+  }
+
+  bool OnLoseContextButtonClicked( Toolkit::Button button )
+  {
+    // Add as an idle callback to avoid ProcessEvents being recursively called.
+    mApplication.AddIdle(MakeCallback( AtlasController::NewWindow ));
+    return true;
+  }
+
+  void OnKeyEvent( const KeyEvent& event )
+  {
+    if(event.state == KeyEvent::Down)
+    {
+      if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
+      {
+        mApplication.Quit();
+      }
+    }
+  }
+
+  void OnPanGesture( Actor actor, const PanGesture& gesture )
+  {
+    if( gesture.state == Gesture::Continuing )
+    {
+      actor.TranslateBy( Vector3( gesture.displacement ) );
+    }
+  }
+
+  void OnContextLost()
+  {
+    printf("Stage reporting context loss\n");
+  }
+
+  void OnContextRegained()
+  {
+    printf("Stage reporting context regain\n");
+    UploadBufferImages();
+  }
+
+private:
+
+  BufferImage CreateBufferImage( const Vector4& color, const unsigned int width, const unsigned int height )
+  {
+    BufferImage imageData = BufferImage::New( width, height, Pixel::RGBA8888 );
+
+    // Create the image
+    PixelBuffer* pixbuf = imageData.GetBuffer();
+    const unsigned int bitmapSize = width * height;
+    for( size_t i = 0; i < bitmapSize; ++i )
+    {
+      pixbuf[i*4+0] = 0xFF * color.r;
+      pixbuf[i*4+1] = 0xFF * color.g;
+      pixbuf[i*4+2] = 0xFF * color.b;
+      pixbuf[i*4+3] = 0xFF * color.a;
+    }
+
+    imageData.Update();
+
+    return imageData;
+  }
+
+
+private:
+  Application&  mApplication;
+  PanGestureDetector mPanGestureDetector;
+
+  Toolkit::View              mView;                              ///< The View instance.
+  Toolkit::ToolBar           mToolBar;                           ///< The View's Toolbar.
+  Toolkit::TextView          mTitleActor;                        ///< The Toolbar's Title.
+  Layer                      mContentLayer;                      ///< Content layer (scrolling cluster content)
+  Toolkit::PushButton        mLoseContextButton;
+  Atlas                      mAtlas;
+};
+
+void RunTest( Application& application )
+{
+  gAtlasController = new AtlasController(application);
+  application.MainLoop(Configuration::APPLICATION_DOES_NOT_HANDLE_CONTEXT_LOSS);
+}
+
+// Entry point for Linux & Tizen applications
+//
+int main( int argc, char **argv )
+{
+  gApplication = Application::New( &argc, &argv );
+
+  RunTest( gApplication );
+
+  return 0;
+}
@@ -346,7 +346,7 @@ private:
     mPaddleImage.SetSize( mPaddleFullSize );
     mWobbleProperty = mPaddle.RegisterProperty(WOBBLE_PROPERTY_NAME, 0.0f);
-    Constraint wobbleConstraint = Constraint::New<Quaternion>( Actor::Property::Rotation,
+    Constraint wobbleConstraint = Constraint::New<Quaternion>( Actor::Property::ORIENTATION,
                                                     LocalSource(mWobbleProperty),
                                                     WobbleConstraint(10.0f));
     mPaddle.ApplyConstraint(wobbleConstraint);
@@ -359,16 +359,16 @@ private:
     const float margin(BALL_SIZE.width * stageSize.width * 0.5f);
     // Set up notifications for ball's collisions against walls.
-    PropertyNotification leftNotification = mBall.AddPropertyNotification( Actor::Property::PositionX, LessThanCondition(margin) );
+    PropertyNotification leftNotification = mBall.AddPropertyNotification( Actor::Property::POSITION_X, LessThanCondition(margin) );
     leftNotification.NotifySignal().Connect( this, &ExampleController::OnHitLeftWall );
-    PropertyNotification rightNotification = mBall.AddPropertyNotification( Actor::Property::PositionX, GreaterThanCondition(stageSize.width - margin) );
+    PropertyNotification rightNotification = mBall.AddPropertyNotification( Actor::Property::POSITION_X, GreaterThanCondition(stageSize.width - margin) );
     rightNotification.NotifySignal().Connect( this, &ExampleController::OnHitRightWall );
-    PropertyNotification topNotification = mBall.AddPropertyNotification( Actor::Property::PositionY, LessThanCondition(margin) );
+    PropertyNotification topNotification = mBall.AddPropertyNotification( Actor::Property::POSITION_Y, LessThanCondition(margin) );
     topNotification.NotifySignal().Connect( this, &ExampleController::OnHitTopWall );
-    PropertyNotification bottomNotification = mBall.AddPropertyNotification( Actor::Property::PositionY, GreaterThanCondition(stageSize.height + margin) );
+    PropertyNotification bottomNotification = mBall.AddPropertyNotification( Actor::Property::POSITION_Y, GreaterThanCondition(stageSize.height + margin) );
     bottomNotification.NotifySignal().Connect( this, &ExampleController::OnHitBottomWall );
     // Set up notification for ball colliding against paddle.
@@ -376,10 +376,10 @@ private:
     stage.Add(delegate);
     Property::Index property = delegate.RegisterProperty(COLLISION_PROPERTY_NAME, Vector3::ZERO);
     Constraint constraint = Constraint::New<Vector3>( property,
-                                                    Source(mBall, Actor::Property::Position),
-                                                    Source(mPaddle, Actor::Property::Position),
-                                                    Source(mBall, Actor::Property::Size),
-                                                    Source(mPaddle, Actor::Property::Size),
+                                                    Source(mBall, Actor::Property::POSITION),
+                                                    Source(mPaddle, Actor::Property::POSITION),
+                                                    Source(mBall, Actor::Property::SIZE),
+                                                    Source(mPaddle, Actor::Property::SIZE),
                                                     CollisionCircleRectangleConstraint( -Vector3(0.0f, mPaddleHitMargin.height * 0.575f, 0.0f),-Vector3(mPaddleHitMargin) ));
     delegate.ApplyConstraint(constraint);
@@ -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,16 +594,17 @@ 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 ) );
     // Add a constraint on the brick between it and the ball generating a collision-property
     Property::Index property = brick.RegisterProperty(COLLISION_PROPERTY_NAME, Vector3::ZERO);
     Constraint constraint = Constraint::New<Vector3>( property,
-                                                    Source(mBall, Actor::Property::Position),
-                                                    Source(brick, Actor::Property::Position),
-                                                    Source(mBall, Actor::Property::Size),
-                                                    Source(brick, Actor::Property::Size),
+                                                    Source(mBall, Actor::Property::POSITION),
+                                                    Source(brick, Actor::Property::POSITION),
+                                                    Source(mBall, Actor::Property::SIZE),
+                                                    Source(brick, Actor::Property::SIZE),
                                                     CollisionCircleRectangleConstraint(BRICK_COLLISION_MARGIN));
     brick.ApplyConstraint(constraint);
@@ -625,6 +627,7 @@ private:
     ImageActor actor = ImageActor::New(img);
     actor.SetParentOrigin(ParentOrigin::TOP_LEFT);
     actor.SetAnchorPoint(AnchorPoint::CENTER);
+    actor.SetRelayoutEnabled( false );
     return actor;
   }
@@ -639,7 +642,7 @@ private:
     }
     mBallAnimation = Animation::New(MAX_ANIMATION_DURATION);
-    mBallAnimation.AnimateBy( Property( mBall, Actor::Property::Position ), mBallVelocity * MAX_ANIMATION_DURATION);
+    mBallAnimation.AnimateBy( Property( mBall, Actor::Property::POSITION ), mBallVelocity * MAX_ANIMATION_DURATION);
     mBallAnimation.Play();
   }
@@ -661,8 +664,8 @@ private:
         mDragActor = actor;
         mDragAnimation = Animation::New(0.25f);
-        mDragAnimation.AnimateTo( Property(mDragActor, Actor::Property::Scale), Vector3(1.1f, 1.1f, 1.0f), AlphaFunctions::EaseOut);
-        mDragAnimation.AnimateTo( Property(mPaddleHandle, Actor::Property::Color), Vector4(1.0f, 1.0f, 1.0f, 0.0f), AlphaFunctions::EaseOut);
+        mDragAnimation.AnimateTo( Property(mDragActor, Actor::Property::SCALE), Vector3(1.1f, 1.1f, 1.0f), AlphaFunctions::EaseOut);
+        mDragAnimation.AnimateTo( Property(mPaddleHandle, Actor::Property::COLOR), Vector4(1.0f, 1.0f, 1.0f, 0.0f), AlphaFunctions::EaseOut);
         mDragAnimation.Play();
       }
     }
@@ -687,8 +690,8 @@ private:
         if(point.state==TouchPoint::Up) // Stop dragging
         {
           mDragAnimation = Animation::New(0.25f);
-          mDragAnimation.AnimateTo( Property(mDragActor, Actor::Property::Scale), Vector3(1.0f, 1.0f, 1.0f), AlphaFunctions::EaseIn);
-          mDragAnimation.AnimateTo( Property(mPaddleHandle, Actor::Property::Color), Vector4(1.0f, 1.0f, 1.0f, 1.0f), AlphaFunctions::EaseOut);
+          mDragAnimation.AnimateTo( Property(mDragActor, Actor::Property::SCALE), Vector3(1.0f, 1.0f, 1.0f), AlphaFunctions::EaseIn);
+          mDragAnimation.AnimateTo( Property(mPaddleHandle, Actor::Property::COLOR), Vector4(1.0f, 1.0f, 1.0f, 1.0f), AlphaFunctions::EaseOut);
           mDragAnimation.Play();
           mDragActor.Reset();
         }
@@ -745,8 +748,8 @@ private:
       mBallVelocity = Vector3::ZERO;
       Animation shrink = Animation::New(0.5f);
-      shrink.AnimateTo( Property(mPaddle, Actor::Property::SizeWidth), mPaddleFullSize.x * f + mPaddleHitMargin.x);
-      shrink.AnimateTo( Property(mPaddleImage, Actor::Property::SizeWidth), mPaddleFullSize.x * f );
+      shrink.AnimateTo( Property(mPaddle, Actor::Property::SIZE_WIDTH), mPaddleFullSize.x * f + mPaddleHitMargin.x);
+      shrink.AnimateTo( Property(mPaddleImage, Actor::Property::SIZE_WIDTH), mPaddleFullSize.x * f );
       shrink.FinishedSignal().Connect( this, &ExampleController::OnPaddleShrunk );
       shrink.Play();
@@ -763,7 +766,7 @@ private:
     mBall.SetPosition( mBallStartPosition );
     mBall.SetColor( Vector4(1.0f, 1.0f, 1.0f, 0.1f) );
     Animation appear = Animation::New(0.5f);
-    appear.AnimateTo( Property(mBall, Actor::Property::Color), Vector4(1.0f, 1.0f, 1.0f, 1.0f) );
+    appear.AnimateTo( Property(mBall, Actor::Property::COLOR), Vector4(1.0f, 1.0f, 1.0f, 1.0f) );
     appear.Play();
     if(!mLives)
@@ -830,7 +833,7 @@ private:
     // fade brick (destroy)
     Animation destroyAnimation = Animation::New(0.5f);
-    destroyAnimation.AnimateTo( Property( brick, Actor::Property::ColorAlpha ), 0.0f, AlphaFunctions::EaseIn );
+    destroyAnimation.AnimateTo( Property( brick, Actor::Property::COLOR_ALPHA ), 0.0f, AlphaFunctions::EaseIn );
     destroyAnimation.Play();
     destroyAnimation.FinishedSignal().Connect( this, &ExampleController::OnBrickDestroyed );
     mDestroyAnimationMap[destroyAnimation] = brick;
@@ -290,6 +290,7 @@ public:
     mFiles.clear();
     mItemView = ItemView::New(*this);
+    mItemView.SetRelayoutEnabled( false );
     stage.Add( mItemView );
     mItemView.SetParentOrigin(ParentOrigin::CENTER);
     mItemView.SetAnchorPoint(AnchorPoint::CENTER);
@@ -396,6 +397,7 @@ public:
   Actor MenuItem(const std::string& text)
   {
     TextView t = TextView::New();
+    t.SetResizePolicy( FILL_TO_PARENT, WIDTH );
     t.SetMarkupProcessingEnabled(true);
     int size = static_cast<int>(DemoHelper::ScalePointSize(6));
@@ -480,6 +482,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,17 +235,17 @@ 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 );
       Toolkit::TextView textView = Toolkit::TextView::New( "Select enabled" );
-      Toolkit::Alignment alignment = Toolkit::Alignment::New( Toolkit::Alignment::HorizontalLeft );
-      alignment.Add( textView );
-      tableView.AddChild( alignment, Toolkit::TableView::CellPosition( 0, 0 ) );
+      tableView.AddChild( textView, Toolkit::TableView::CellPosition( 0, 0 ) );
       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" );
@@ -276,7 +279,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 );
@@ -336,7 +340,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();
@@ -345,7 +350,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 ) );
@@ -484,7 +489,7 @@ void RunTest( Application&amp; application )
   application.MainLoop();
 }
-// Entry point for Linux & SLP applications
+// Entry point for Linux & Tizen applications
 //
 int main( int argc, char **argv )
 {
@@ -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);
@@ -524,9 +527,16 @@ public:
     const char **paths = IMAGE_GROUPS[clusterType];
     DALI_ASSERT_ALWAYS(paths);
-    // Add a background image to the cluster
+    // Add a background image to the cluster, limiting the loaded size by
+    // fitting it inside a quarter of the stage area with the conservative Box
+    // filter mode:
+    Dali::ImageAttributes backgroundAttributes;
+    backgroundAttributes.SetSize( Stage::GetCurrent().GetSize() * 0.5f );
+    backgroundAttributes.SetFilterMode( Dali::ImageAttributes::Box );
+    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
@@ -552,10 +562,12 @@ public:
     actor.SetParentOrigin( ParentOrigin::CENTER );
     actor.SetAnchorPoint( AnchorPoint::CENTER );
-    // Load the thumbnail
+    // Load the thumbnail at quarter of screen width or standard size if that is smaller:
     ImageAttributes attribs = ImageAttributes::New();
-    attribs.SetSize(CLUSTER_IMAGE_THUMBNAIL_WIDTH, CLUSTER_IMAGE_THUMBNAIL_HEIGHT);
-    attribs.SetScalingMode(Dali::ImageAttributes::ShrinkToFit);
+    Size stageQuarter = Stage::GetCurrent().GetSize() * 0.25f;
+    attribs.SetSize( std::min( stageQuarter.x, CLUSTER_IMAGE_THUMBNAIL_WIDTH), std::min( stageQuarter.y, CLUSTER_IMAGE_THUMBNAIL_HEIGHT ) );
+    attribs.SetFilterMode( Dali::ImageAttributes::BoxThenLinear );
+    attribs.SetScalingMode(Dali::ImageAttributes::ShrinkToFit );
     // Add a shadow image child actor
     Image shadowImage = ResourceImage::New( CLUSTER_SHADOW_IMAGE_PATH, attribs );
@@ -568,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 );
@@ -577,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).
@@ -587,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 );
@@ -617,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);
@@ -707,7 +722,7 @@ public:
           Vector2 shearCenter( Vector2(position.x + size.width * shearAnchor.x, position.y + size.height * shearAnchor.y) );
           Property::Index centerProperty = shaderEffect.GetPropertyIndex(shaderEffect.GetCenterPropertyName());
           Constraint constraint = Constraint::New<Vector2>( centerProperty,
-                                                            Source(mView, Actor::Property::Size),
+                                                            Source(mView, Actor::Property::SIZE),
                                                             ShearEffectCenterConstraint(stageSize, shearCenter) );
           shaderEffect.ApplyConstraint(constraint);
@@ -720,12 +735,12 @@ public:
           constraint = Constraint::New<float>( angleXAxisProperty,
                                                Source(mScrollView, scrollOvershootProperty),
-                                               Source(mView, Actor::Property::Rotation),
+                                               Source(mView, Actor::Property::ORIENTATION),
                                                ShearEffectConstraint(stageSize, SHEAR_EFFECT_MAX_OVERSHOOT, Vector2::XAXIS) );
           shaderEffect.ApplyConstraint(constraint);
           constraint = Constraint::New<float>( angleYAxisProperty,
                                                Source(mScrollView, scrollOvershootProperty),
-                                               Source(mView, Actor::Property::Rotation),
+                                               Source(mView, Actor::Property::ORIENTATION),
                                                ShearEffectConstraint(stageSize, SHEAR_EFFECT_MAX_OVERSHOOT, Vector2::YAXIS) );
           shaderEffect.ApplyConstraint(constraint);
@@ -752,7 +767,7 @@ public:
         Property::Index anglePerUnit = shaderEffect.GetPropertyIndex( shaderEffect.GetAnglePerUnitPropertyName() );
         shaderEffect.ApplyConstraint( Constraint::New<Vector2>( anglePerUnit,
-                                                                Source(mView, Actor::Property::Rotation),
+                                                                Source(mView, Actor::Property::ORIENTATION),
                                                                 CarouselEffectOrientationConstraint( angleSweep ) ) );
         break;
@@ -779,7 +794,7 @@ public:
         // dont apply shader effect to scrollview as it might override internal shaders for bounce effect etc
         for( std::vector<ClusterInfo>::iterator i = mClusterInfo.begin(); i != mClusterInfo.end(); ++i )
         {
-          Constraint constraint = Constraint::New<float>(Actor::Property::PositionZ, SphereEffectOffsetConstraint(SPHERE_EFFECT_POSITION_Z));
+          Constraint constraint = Constraint::New<float>(Actor::Property::POSITION_Z, SphereEffectOffsetConstraint(SPHERE_EFFECT_POSITION_Z));
           constraint.SetRemoveAction(Constraint::Discard);
           Cluster cluster = i->mCluster;
           SetShaderEffectRecursively( cluster, shaderEffect );
@@ -865,7 +880,7 @@ void RunTest(Application&amp; app)
   app.MainLoop();
 }
-// Entry point for Linux & SLP applications
+// Entry point for Linux & Tizen applications
 //
 int main(int argc, char **argv)
 {
@@ -85,6 +85,25 @@ const float CUBE_DISPLACEMENT_CROSS(30.f);
 // The duration of the current image staying on screen when slideshow is on
 const int VIEWINGTIME = 2000; // 2 seconds
+
+/**
+ * @brief Load an image, scaled-down to no more than the stage dimensions.
+ *
+ * Uses image scaling mode ImageAttributes::ScaleToFill to resize the image at
+ * load time to cover the entire stage with pixels with no borders,
+ * and filter mode ImageAttributes::BoxThenLinear to sample the image with
+ * maximum quality.
+ */
+ResourceImage LoadStageFillingImage( const char * const imagePath )
+{
+  Size stageSize = Stage::GetCurrent().GetSize();
+  ImageAttributes attributes;
+  attributes.SetSize( stageSize.x, stageSize.y );
+  attributes.SetFilterMode( ImageAttributes::BoxThenLinear );
+  attributes.SetScalingMode( ImageAttributes::ScaleToFill );
+  return ResourceImage::New( imagePath, attributes );
+}
+
 } // namespace
 class CubeTransitionApp : public ConnectionTracker
@@ -264,11 +283,12 @@ void CubeTransitionApp::OnInit( Application&amp; application )
   mViewTimer.TickSignal().Connect( this, &CubeTransitionApp::OnTimerTick );
   // show the first image
-  mImageConstraint = Constraint::New<Vector3>( Actor::Property::Scale, LocalSource( Actor::Property::Size ), ParentSource( Actor::Property::Size ), ScaleToFitKeepAspectRatioConstraint() );
+  mImageConstraint = Constraint::New<Vector3>( Actor::Property::SCALE, LocalSource( Actor::Property::SIZE ), ParentSource( Actor::Property::SIZE ), ScaleToFitKeepAspectRatioConstraint() );
-  mCurrentImage = ImageActor::New( ResourceImage::New( IMAGES[mIndex] ) );
+  mCurrentImage = ImageActor::New( LoadStageFillingImage( IMAGES[mIndex] ) );
   mCurrentImage.SetPositionInheritanceMode( USE_PARENT_POSITION );
   mCurrentImage.ApplyConstraint( mImageConstraint );
+  mCurrentImage.SetRelayoutEnabled( false );
   mParent.Add( mCurrentImage );
   mCurrentEffect = mCubeWaveEffect;
@@ -308,10 +328,12 @@ void CubeTransitionApp::OnPanGesture( Actor actor, const PanGesture&amp; gesture )
 void CubeTransitionApp::GoToNextImage()
 {
-  ResourceImage image = ResourceImage::New( IMAGES[ mIndex ] );
+  ResourceImage image = LoadStageFillingImage( IMAGES[ mIndex ] );
   mNextImage = ImageActor::New( image );
+
   mNextImage.SetPositionInheritanceMode(USE_PARENT_POSITION);
   mNextImage.ApplyConstraint( mImageConstraint );
+  mNextImage.SetRelayoutEnabled( false );
   mCurrentEffect.SetTargetImage(mNextImage);
   if( image.GetLoadingState() == ResourceLoadingSucceeded )
   {
@@ -417,7 +439,7 @@ void CubeTransitionApp::OnKeyEvent(const KeyEvent&amp; event)
   }
 }
-// Entry point for Linux & SLP applications
+// Entry point for Linux & Tizen applications
 int main( int argc, char **argv )
 {
   Application application = Application::New( &argc, &argv );
@@ -71,6 +71,25 @@ const int VIEWINGTIME = 2000; // 2 seconds
 const float TRANSITION_DURATION = 2.5f; //2.5 second
 const float INITIAL_DEPTH = -10.0f;
+
+/**
+ * @brief Load an image, scaled-down to no more than the stage dimensions.
+ *
+ * Uses image scaling mode ImageAttributes::ScaleToFill to resize the image at
+ * load time to cover the entire stage with pixels with no borders,
+ * and filter mode ImageAttributes::BoxThenLinear to sample the image with
+ * maximum quality.
+ */
+ResourceImage LoadStageFillingImage( const char * const imagePath )
+{
+  Size stageSize = Stage::GetCurrent().GetSize();
+  ImageAttributes attributes;
+  attributes.SetSize( stageSize.x, stageSize.y );
+  attributes.SetFilterMode( ImageAttributes::BoxThenLinear );
+  attributes.SetScalingMode( ImageAttributes::ScaleToFill );
+  return ResourceImage::New( imagePath, attributes );
+}
+
 } // namespace
 class DissolveEffectApp : public ConnectionTracker
@@ -232,10 +251,10 @@ void DissolveEffectApp::OnInit( Application&amp; application )
   mParent.SetPositionInheritanceMode( USE_PARENT_POSITION );
   mContent.Add( mParent );
-  mSizeConstraint= Constraint::New<Vector3>( Actor::Property::Scale, LocalSource( Actor::Property::Size ), ParentSource( Actor::Property::Size ), ScaleToFitKeepAspectRatioConstraint() );
+  mSizeConstraint= Constraint::New<Vector3>( Actor::Property::SCALE, LocalSource( Actor::Property::SIZE ), ParentSource( Actor::Property::SIZE ), ScaleToFitKeepAspectRatioConstraint() );
   // show the first image
-  mCurrentImage = ImageActor::New( ResourceImage::New( IMAGES[mIndex] ) );
+  mCurrentImage = ImageActor::New( LoadStageFillingImage( IMAGES[mIndex] ) );
   mCurrentImage.SetPositionInheritanceMode(USE_PARENT_POSITION_PLUS_LOCAL_POSITION);
   mCurrentImage.ApplyConstraint( mSizeConstraint );
   mParent.Add( mCurrentImage );
@@ -263,7 +282,7 @@ void DissolveEffectApp::OnPanGesture( Actor actor, const PanGesture&amp; gesture )
       mIndex = (mIndex + NUM_IMAGES -1)%NUM_IMAGES;
     }
-    Image image = ResourceImage::New( IMAGES[ mIndex ] );
+    Image image = LoadStageFillingImage( IMAGES[ mIndex ] );
     mNextImage = ImageActor::New( image );
     mNextImage.SetPositionInheritanceMode(USE_PARENT_POSITION_PLUS_LOCAL_POSITION);
     mNextImage.ApplyConstraint( mSizeConstraint );
@@ -375,7 +394,7 @@ bool DissolveEffectApp::OnTimerTick()
   if(mSlideshow)
   {
     mIndex = (mIndex + 1)%NUM_IMAGES;
-    Image image = ResourceImage::New( IMAGES[ mIndex ] );
+    Image image = LoadStageFillingImage( IMAGES[ mIndex ] );
     mNextImage = ImageActor::New( image );
     mNextImage.SetPositionInheritanceMode(USE_PARENT_POSITION_PLUS_LOCAL_POSITION);
     mNextImage.ApplyConstraint( mSizeConstraint );
@@ -410,7 +429,7 @@ bool DissolveEffectApp::OnTimerTick()
   return false;   //return false to stop the timer
 }
-// Entry point for Linux & SLP applications
+// Entry point for Linux & Tizen applications
 int main( int argc, char **argv )
 {
   Application application = Application::New( &argc, &argv );
@@ -79,7 +79,7 @@ void RunTest( Application&amp; application )
   application.MainLoop();
 }
-// Entry point for Linux & SLP applications
+// Entry point for Linux & Tizen applications
 //
 int main( int argc, char **argv )
 {
@@ -183,6 +183,7 @@ Image CreateImage(const std::string&amp; filename, unsigned int width, unsigned int 
   attributes.SetSize( width, height );
   attributes.SetScalingMode( scalingMode );
+  attributes.SetFilterMode( ImageAttributes::BoxThenLinear );
   Image image = ResourceImage::New( filename, attributes );
   return image;
 }
@@ -359,6 +360,9 @@ public:
     mContentLayer.Add( mScrollView );
     mScrollView.Add( imageField );
     mGridActor = imageField;
+
+    // Scroll to top of grid so first images loaded are on-screen:
+    mScrollView.ScrollTo( Vector3( 0, -1000000, 0 ) );
   }
   /**
@@ -417,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 );
@@ -99,6 +99,10 @@ const char* IMAGE_PATHS[] = {
 const unsigned int NUM_IMAGES = sizeof(IMAGE_PATHS) / sizeof(char*);
+const unsigned int IMAGE_WIDTH = 256;
+const unsigned int IMAGE_HEIGHT = 256;
+const unsigned int NUM_IMAGE_PER_ROW_IN_ATLAS = 8;
+
 AlphaFunction ALPHA_FUNCTIONS[] = { AlphaFunctions::Linear,
                                     AlphaFunctions::EaseIn,
                                     AlphaFunctions::EaseOut };
@@ -277,7 +281,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 );
@@ -291,7 +296,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 );
@@ -305,14 +311,17 @@ 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 );
     stage.Add( mReplaceButton );
     // Create the item view actor
+    mImageAtlas = CreateImageAtlas();
     mItemView = ItemView::New(*this);
+    mItemView.SetRelayoutEnabled( false );
     mItemView.SetParentOrigin(ParentOrigin::CENTER);
     mItemView.SetAnchorPoint(AnchorPoint::CENTER);
@@ -876,8 +885,12 @@ public: // From ItemFactory
   virtual Actor NewItem(unsigned int itemId)
   {
     // Create an image actor for this item
-    Image image = ResourceImage::New( IMAGE_PATHS[itemId % NUM_IMAGES] );
-    Actor actor = ImageActor::New(image);
+    unsigned int imageId = itemId % NUM_IMAGES;
+    ImageActor::PixelArea pixelArea( (imageId%NUM_IMAGE_PER_ROW_IN_ATLAS)*IMAGE_WIDTH,
+                                     (imageId/NUM_IMAGE_PER_ROW_IN_ATLAS)*IMAGE_HEIGHT,
+                                      IMAGE_WIDTH,
+                                      IMAGE_HEIGHT );
+    Actor actor = ImageActor::New(mImageAtlas, pixelArea);
     actor.SetPosition( INITIAL_OFFSCREEN_POSITION );
     // Add a border image child actor
@@ -888,6 +901,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);
@@ -899,6 +913,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 );
@@ -915,6 +930,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 );
@@ -936,6 +952,23 @@ public: // From ItemFactory
 private:
   /**
+   * Create an Atlas to tile the images inside.
+   */
+  Atlas CreateImageAtlas()
+  {
+    const unsigned int atlas_width = IMAGE_WIDTH*NUM_IMAGE_PER_ROW_IN_ATLAS;
+    const unsigned int atlas_height = IMAGE_HEIGHT*ceil( static_cast<float>(NUM_IMAGES)/ static_cast<float>(NUM_IMAGE_PER_ROW_IN_ATLAS));
+    Atlas atlas = Atlas::New(atlas_width, atlas_height, Pixel::RGB888);
+
+    for( unsigned int i = 0; i < NUM_IMAGES; i++ )
+    {
+      atlas.Upload( IMAGE_PATHS[i], (i%NUM_IMAGE_PER_ROW_IN_ATLAS)*IMAGE_WIDTH, (i/NUM_IMAGE_PER_ROW_IN_ATLAS)*IMAGE_HEIGHT );
+    }
+
+    return atlas;
+  }
+
+  /**
    * Sets/Updates the title of the View
    * @param[in] title The new title for the view.
    */
@@ -962,23 +995,23 @@ 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();
-    slider.SetProperty( Slider::LOWER_BOUND_PROPERTY, 0.0f );
-    slider.SetProperty( Slider::UPPER_BOUND_PROPERTY, 3.0f );
-    slider.SetProperty( Slider::VALUE_PROPERTY, mDurationSeconds );
-    slider.SetProperty( Slider::VALUE_PRECISION_PROPERTY, 2 );
-    slider.SetProperty( Slider::SHOW_POPUP_PROPERTY, true );
+    slider.SetProperty( Slider::Property::LOWER_BOUND, 0.0f );
+    slider.SetProperty( Slider::Property::UPPER_BOUND, 3.0f );
+    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 );
     TextStyle defaultTextStyle;
     defaultTextStyle.SetFontName(DEFAULT_TEXT_STYLE_FONT_FAMILY);
@@ -992,19 +1025,21 @@ private:
     text.SetParentOrigin( ParentOrigin::TOP_LEFT );
     text.SetTextAlignment( Dali::Toolkit::Alignment::HorizontalLeft );
     text.SetStyleToCurrentText( defaultTextStyle );
-    text.SetSize( 0.0f, LABEL_TEXT_SIZE_Y );
-    text.ApplyConstraint( Dali::Constraint::New<float>( Dali::Actor::Property::SizeWidth, Dali::ParentSource( Dali::Actor::Property::SizeWidth ), Dali::EqualToConstraint() ) );
+    text.SetResizePolicy( FILL_TO_PARENT, WIDTH );
+    text.SetResizePolicy( FIXED, HEIGHT );
+    text.SetPreferredSize( Vector2( 0.0f, LABEL_TEXT_SIZE_Y ) );
     text.SetZ( -0.9f );
     slider.Add( text );
     Actor textContainer = Actor::New();
+    textContainer.SetRelayoutEnabled( true );
+    textContainer.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
     mAlphaFunctionText = TextView::New( ALPHA_FUNCTIONS_TEXT[mAlphaFuncIndex] );
     mAlphaFunctionText.SetAnchorPoint( ParentOrigin::CENTER );
     mAlphaFunctionText.SetParentOrigin( ParentOrigin::CENTER );
     mAlphaFunctionText.SetTextAlignment( Toolkit::Alignment::VerticalCenter );
     textContainer.Add( mAlphaFunctionText );
     tableView.AddChild( textContainer, TableView::CellPosition( 1, 0 ) );
-    tableView.SetRelativeHeight( 0, 0.5f );
     mTapDetector = TapGestureDetector::New();
     mTapDetector.Attach(mAlphaFunctionText);
@@ -1015,10 +1050,12 @@ private:
     text.SetParentOrigin( ParentOrigin::TOP_LEFT );
     text.SetTextAlignment( Dali::Toolkit::Alignment::HorizontalLeft );
     text.SetStyleToCurrentText( defaultTextStyle );
-    text.SetSize( 0.0f, LABEL_TEXT_SIZE_Y );
-    text.ApplyConstraint( Dali::Constraint::New<float>( Dali::Actor::Property::SizeWidth, Dali::ParentSource( Dali::Actor::Property::SizeWidth ), Dali::EqualToConstraint() ) );
+    text.SetResizePolicy( FILL_TO_PARENT, WIDTH );
+    text.SetResizePolicy( FIXED, HEIGHT );
+    text.SetPreferredSize( Vector2( 0.0f, LABEL_TEXT_SIZE_Y ) );
     textContainer.Add( text );
+    mMenu.MarkDirtyForRelayout();
     mMenu.Show();
     mMenuShown = true;
   }
@@ -1107,6 +1144,7 @@ private:
   ItemView mItemView;
   Image mBorderImage;
+  Atlas mImageAtlas;
   unsigned int mCurrentLayout;
   float mDurationSeconds;
@@ -275,7 +275,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();
@@ -326,7 +326,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();
@@ -377,7 +377,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();
@@ -509,7 +509,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();
@@ -763,7 +763,7 @@ void RunTest( Application&amp; application )
   application.MainLoop();
 }
-// Entry point for Linux & SLP applications
+// Entry point for Linux & Tizen applications
 //
 int main( int argc, char **argv )
 {
@@ -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 );
@@ -240,17 +242,18 @@ public:
     overlay.Add( mMagnifier );
     // Apply constraint to animate the position of the magnifier.
-    Constraint constraint = Constraint::New<Vector3>(Actor::Property::Position,
-                                                     LocalSource(Actor::Property::Size),
-                                                     LocalSource(Actor::Property::ParentOrigin),
-                                                     LocalSource(Actor::Property::AnchorPoint),
-                                                     ParentSource(Actor::Property::Size),
+    Constraint constraint = Constraint::New<Vector3>(Actor::Property::POSITION,
+                                                     LocalSource(Actor::Property::SIZE),
+                                                     LocalSource(Actor::Property::PARENT_ORIGIN),
+                                                     LocalSource(Actor::Property::ANCHOR_POINT),
+                                                     ParentSource(Actor::Property::SIZE),
                                                      ConfinementConstraint(ParentOrigin::CENTER, Vector2::ONE * MAGNIFIER_INDENT, Vector2::ONE * MAGNIFIER_INDENT));
     constraint.SetRemoveAction(Constraint::Discard);
     mMagnifier.ApplyConstraint( constraint );
     // 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 );
@@ -260,15 +263,15 @@ public:
     ContinueAnimation();
     // Apply constraint to animate the position of the magnifier.
-    constraint = Constraint::New<Vector3>(Actor::Property::Position,
-                                          LocalSource(Actor::Property::Size),
+    constraint = Constraint::New<Vector3>(Actor::Property::POSITION,
+                                          LocalSource(Actor::Property::SIZE),
                                           LocalSource(mAnimationTimeProperty),
                                           MagnifierPathConstraint(mStageSize, mStageSize * 0.5f));
     mBouncingMagnifier.ApplyConstraint( constraint );
     // Apply constraint to animate the source of the magnifier.
     constraint = Constraint::New<Vector3>(mBouncingMagnifier.GetPropertyIndex( Toolkit::Magnifier::SOURCE_POSITION_PROPERTY_NAME ),
-                                          LocalSource(Actor::Property::Size),
+                                          LocalSource(Actor::Property::SIZE),
                                           LocalSource(mAnimationTimeProperty),
                                           MagnifierPathConstraint(mStageSize));
     mBouncingMagnifier.ApplyConstraint( constraint );
@@ -355,7 +358,7 @@ public:
     if(!mMagnifierShown)
     {
       Animation animation = Animation::New(MAGNIFIER_DISPLAY_DURATION);
-      animation.AnimateTo(Property(mMagnifier, Actor::Property::Scale), Vector3::ONE, AlphaFunctions::EaseIn);
+      animation.AnimateTo(Property(mMagnifier, Actor::Property::SCALE), Vector3::ONE, AlphaFunctions::EaseIn);
       animation.Play();
       mMagnifierShown = true;
     }
@@ -369,7 +372,7 @@ public:
     if(mMagnifierShown)
     {
       Animation animation = Animation::New(MAGNIFIER_DISPLAY_DURATION);
-      animation.AnimateTo(Property(mMagnifier, Actor::Property::Scale), Vector3::ZERO, AlphaFunctions::EaseOut);
+      animation.AnimateTo(Property(mMagnifier, Actor::Property::SCALE), Vector3::ZERO, AlphaFunctions::EaseOut);
       animation.Play();
       mMagnifierShown = false;
     }
@@ -422,7 +425,7 @@ void RunTest( Application&amp; application )
   application.MainLoop();
 }
-// Entry point for Linux & SLP applications
+// Entry point for Linux & Tizen applications
 //
 int main( int argc, char **argv )
 {
@@ -88,9 +88,25 @@ const Vector3 BUTTON_TITLE_LABEL_INSTRUCTIONS_POPUP_SIZE_CONSTRAINT( 1.0f, 1.0f,
 const float BUTTON_TITLE_LABEL_Y_OFFSET = 0.05f;
 const float ORIENTATION_DURATION = 0.5f;                  ///< Time to rotate to new orientation.
-} // unnamed namespace
+/**
+ * @brief Load an image, scaled-down to no more than the dimensions passed in.
+ *
+ * Uses ImageAttributes::ShrinkToFit which ensures the resulting image is
+ * smaller than or equal to the specified dimensions while preserving its
+ * original aspect ratio.
+ */
+ResourceImage LoadImageFittedInBox( const char * const imagePath, uint32_t maxWidth, uint32_t maxHeight )
+{
+  // Load the image nicely scaled-down to fit within the specified max width and height:
+  ImageAttributes attributes;
+  attributes.SetSize( maxWidth, maxHeight);
+  attributes.SetFilterMode( ImageAttributes::BoxThenLinear );
+  attributes.SetScalingMode( ImageAttributes::ShrinkToFit );
+  return ResourceImage::New( imagePath, attributes );
+}
+} // unnamed namespace
 //
@@ -187,10 +203,15 @@ public:
     // Motion blurred actor
     //
-    Image image = ResourceImage::New( MOTION_BLUR_ACTOR_IMAGE1 );
+    // Scale down actor to fit on very low resolution screens with space to interact:
+    Size stageSize = Stage::GetCurrent().GetSize();
+    mMotionBlurActorSize = Size( std::min( stageSize.x * 0.3f, MOTION_BLUR_ACTOR_WIDTH ), std::min( stageSize.y * 0.3f, MOTION_BLUR_ACTOR_HEIGHT ) );
+    mMotionBlurActorSize = Size( std::min( mMotionBlurActorSize.x, mMotionBlurActorSize.y ), std::min( mMotionBlurActorSize.x, mMotionBlurActorSize.y ) );
+
+    Image image = LoadImageFittedInBox( MOTION_BLUR_ACTOR_IMAGE1, mMotionBlurActorSize.x, mMotionBlurActorSize.y );
     mMotionBlurImageActor = ImageActor::New(image);
     mMotionBlurImageActor.SetParentOrigin( ParentOrigin::CENTER );
-    mMotionBlurImageActor.SetSize(MOTION_BLUR_ACTOR_WIDTH, MOTION_BLUR_ACTOR_HEIGHT);
+    mMotionBlurImageActor.SetSize(mMotionBlurActorSize.x, mMotionBlurActorSize.y);
     mContentLayer.Add( mMotionBlurImageActor );
@@ -207,8 +228,8 @@ public:
     mMotionBlurImageActor2 = ImageActor::New(image);
     mMotionBlurImageActor2.SetParentOrigin( ParentOrigin::CENTER );
-    mMotionBlurImageActor2.SetSize(MOTION_BLUR_ACTOR_WIDTH, MOTION_BLUR_ACTOR_HEIGHT);
-    mMotionBlurImageActor2.SetPosition(MOTION_BLUR_ACTOR_WIDTH * 1.1f, 0.0f);
+    mMotionBlurImageActor2.SetSize(mMotionBlurActorSize.x, mMotionBlurActorSize.y);
+    mMotionBlurImageActor2.SetPosition(mMotionBlurActorSize.x * 1.1f, 0.0f);
     mMotionBlurImageActor.Add( mMotionBlurImageActor2 );
     // Create shader used for doing motion blur
@@ -225,8 +246,8 @@ public:
     mMotionBlurImageActor3 = ImageActor::New(image);
     mMotionBlurImageActor3.SetParentOrigin( ParentOrigin::CENTER );
-    mMotionBlurImageActor3.SetSize(MOTION_BLUR_ACTOR_WIDTH, MOTION_BLUR_ACTOR_HEIGHT);
-    mMotionBlurImageActor3.SetPosition(-MOTION_BLUR_ACTOR_WIDTH * 1.1f, 0.0f);
+    mMotionBlurImageActor3.SetSize(mMotionBlurActorSize.x, mMotionBlurActorSize.y);
+    mMotionBlurImageActor3.SetPosition(-mMotionBlurActorSize.x * 1.1f, 0.0f);
     mMotionBlurImageActor.Add( mMotionBlurImageActor3 );
     // Create shader used for doing motion blur
@@ -243,8 +264,8 @@ public:
     mMotionBlurImageActor4 = ImageActor::New(image);
     mMotionBlurImageActor4.SetParentOrigin( ParentOrigin::CENTER );
-    mMotionBlurImageActor4.SetSize(MOTION_BLUR_ACTOR_WIDTH, MOTION_BLUR_ACTOR_HEIGHT);
-    mMotionBlurImageActor4.SetPosition(0.0f, MOTION_BLUR_ACTOR_HEIGHT * 1.1f);
+    mMotionBlurImageActor4.SetSize(mMotionBlurActorSize.x, mMotionBlurActorSize.y);
+    mMotionBlurImageActor4.SetPosition(0.0f, mMotionBlurActorSize.y * 1.1f);
     mMotionBlurImageActor.Add( mMotionBlurImageActor4 );
     // Create shader used for doing motion blur
@@ -261,8 +282,8 @@ public:
     mMotionBlurImageActor5 = ImageActor::New(image);
     mMotionBlurImageActor5.SetParentOrigin( ParentOrigin::CENTER );
-    mMotionBlurImageActor5.SetSize(MOTION_BLUR_ACTOR_WIDTH, MOTION_BLUR_ACTOR_HEIGHT);
-    mMotionBlurImageActor5.SetPosition(0.0f, -MOTION_BLUR_ACTOR_HEIGHT * 1.1f);
+    mMotionBlurImageActor5.SetSize(mMotionBlurActorSize.x, mMotionBlurActorSize.y);
+    mMotionBlurImageActor5.SetPosition(0.0f, -mMotionBlurActorSize.y * 1.1f);
     mMotionBlurImageActor.Add( mMotionBlurImageActor5 );
     // Create shader used for doing motion blur
@@ -312,7 +333,7 @@ public:
       else
       {
         // set the rotation to match the orientation
-        mView.SetRotation( Degree( -orientation ), Vector3::ZAXIS );
+        mView.SetOrientation( Degree( -orientation ), Vector3::ZAXIS );
         mView.SetSize( targetSize );
       }
     }
@@ -349,7 +370,7 @@ public:
     mActorTapMovementAnimation = Animation::New( animDuration );
     if ( mMotionBlurImageActor )
     {
-      mActorTapMovementAnimation.AnimateTo( Property(mMotionBlurImageActor, Actor::Property::Position), destPos, AlphaFunctions::EaseInOutSine, TimePeriod(animDuration) );
+      mActorTapMovementAnimation.AnimateTo( Property(mMotionBlurImageActor, Actor::Property::POSITION), destPos, AlphaFunctions::EaseInOutSine, TimePeriod(animDuration) );
     }
     mActorTapMovementAnimation.SetEndAction( Animation::Bake );
     mActorTapMovementAnimation.Play();
@@ -478,7 +499,7 @@ public:
       mCurrentImage = 0;
     }
-    Image blurImage = ResourceImage::New( MOTION_BLUR_ACTOR_IMAGES[mCurrentImage] );
+    Image blurImage = LoadImageFittedInBox( MOTION_BLUR_ACTOR_IMAGES[mCurrentImage], mMotionBlurActorSize.x, mMotionBlurActorSize.y );
     mMotionBlurImageActor.SetImage(blurImage);
   }
@@ -498,6 +519,7 @@ private:
   // Motion blur
   MotionBlurEffect mMotionBlurEffect;
   ImageActor mMotionBlurImageActor;
+  Size mMotionBlurActorSize;
 #ifdef MULTIPLE_MOTION_BLURRED_ACTORS
   MotionBlurEffect mMotionBlurEffect2;
@@ -537,7 +559,7 @@ void RunTest(Application&amp; app)
   app.MainLoop();
 }
-// Entry point for Linux & SLP applications
+// Entry point for Linux & Tizen applications
 //
 int main(int argc, char **argv)
 {
@@ -225,7 +225,7 @@ public:
       else
       {
         // set the rotation to match the orientation
-        mView.SetRotation( Degree( -orientation ), Vector3::ZAXIS );
+        mView.SetOrientation( Degree( -orientation ), Vector3::ZAXIS );
         mView.SetSize( targetSize );
       }
     }
@@ -261,7 +261,7 @@ public:
     mActorTapMovementAnimation = Animation::New( animDuration );
     if ( mMotionStretchImageActor )
     {
-      mActorTapMovementAnimation.AnimateTo( Property(mMotionStretchImageActor, Actor::Property::Position), destPos, AlphaFunctions::EaseInOutSine, TimePeriod(animDuration) );
+      mActorTapMovementAnimation.AnimateTo( Property(mMotionStretchImageActor, Actor::Property::POSITION), destPos, AlphaFunctions::EaseInOutSine, TimePeriod(animDuration) );
     }
     mActorTapMovementAnimation.SetEndAction( Animation::Bake );
     mActorTapMovementAnimation.Play();
@@ -435,7 +435,7 @@ void RunTest(Application&amp; app)
   app.MainLoop();
 }
-// Entry point for Linux & SLP applications
+// Entry point for Linux & Tizen applications
 //
 int main(int argc, char **argv)
 {
@@ -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 );
+/*
+ * 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 )
+{
+  TextActor textActor = TextActor::New( "JSON & JavaScript Launcher..." );
+
+  // Reposition the actor
+  textActor.SetParentOrigin( ParentOrigin::TOP_LEFT );
+  textActor.SetAnchorPoint( AnchorPoint::TOP_LEFT );
+  textActor.SetPosition( 20, 0 );
+
+  // Get a handle to the stage
+  Stage stage = Stage::GetCurrent();
+
+  // Display the actor on the stage
+  stage.Add( textActor );
+
+  // 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
+/*
+ * 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 <string>
+#include <stdio.h>
+#include <sys/stat.h>
+#include <dali/integration-api/debug.h>
+
+// INTERNAL INCLUDES
+#include "launcher.h"
+
+namespace
+{
+bool CheckIfFileExists( const std::string& filename )
+{
+  struct stat buf;
+  // fstat returns -1 on error
+  if (stat( filename.c_str(), &buf) != -1)
+  {
+      return true;
+  }
+  return false;
+}
+
+}
+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;
+
+  for( int i = 1 ; i < argc ; ++i )
+  {
+    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;
+      }
+    }
+  }
+
+  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;
+  }
+
+
+  Launcher daliApplication( Dali::Application::New( &argc, &argv ), jSONFileName, javaScriptFileName );
+
+  daliApplication.MainLoop();
+
+  return 0;
+}
@@ -210,7 +210,7 @@ public:
     // Hack to force screen refresh.
     Animation animation = Animation::New(1.0f);
-    animation.AnimateTo(Property(mContentLayer, Actor::Property::Position), Vector3::ZERO );
+    animation.AnimateTo(Property(mContentLayer, Actor::Property::POSITION), Vector3::ZERO );
     animation.Play();
   }
@@ -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 );
@@ -315,7 +317,7 @@ private:
     {
       for(int column = 0;column<imageColumns;column++)
       {
-        ImageActor image = CreateImage( GetNextImagePath() );
+        ImageActor image = CreateImage( GetNextImagePath(), imageSize.x, imageSize.y );
         image.SetParentOrigin( ParentOrigin::CENTER );
         image.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 )
      {
@@ -562,9 +565,11 @@ private:
     ImageAttributes attributes;
     attributes.SetSize(width, height);
-    attributes.SetScalingMode(ImageAttributes::ShrinkToFit);
+    attributes.SetScalingMode(ImageAttributes::ScaleToFill);
+    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);
@@ -189,7 +189,7 @@ public:
     mView.SetPosition(Vector3(0.0f, 0.0f, -50));
     mContents.SetPosition(mTranslation);
-    mContents.SetRotation(CalculateWorldRotation(Radian(mLongitudinal), Radian(mAxisTilt)));
+    mContents.SetOrientation(CalculateWorldRotation(Radian(mLongitudinal), Radian(mAxisTilt)));
     mContents.SetScale(mPinchScale, mPinchScale, mPinchScale);
     mPanGestureDetector = PanGestureDetector::New();
@@ -213,7 +213,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);
@@ -232,7 +233,7 @@ public:
     mLightAnchor = Actor::New();
     mLightAnchor.SetParentOrigin(ParentOrigin::CENTER);
     mLightAnchor.SetAnchorPoint(AnchorPoint::CENTER);
-    mLightAnchor.SetRotation(CalculateWorldRotation(Radian(mLightLongitudinal), Radian(mLightAxisTilt)));
+    mLightAnchor.SetOrientation(CalculateWorldRotation(Radian(mLightLongitudinal), Radian(mLightAxisTilt)));
     // Work out a scaling factor as the initial light position was calculated for desktop
     // Need to scale light position as scene actor size is based on stage size (i.e. much bigger on device)
@@ -286,9 +287,9 @@ public:
     Property::Index angleIndex = mImageActor2.RegisterProperty("angle", Property::Value(30.0f));
     Source angleSrc( mImageActor2, angleIndex );
-    mImageActor1.ApplyConstraint(Constraint::New<Quaternion>( Actor::Property::Rotation, angleSrc,
+    mImageActor1.ApplyConstraint(Constraint::New<Quaternion>( Actor::Property::ORIENTATION, angleSrc,
                                                               RotationConstraint(-1.0f)));
-    mImageActor3.ApplyConstraint(Constraint::New<Quaternion>( Actor::Property::Rotation, angleSrc,
+    mImageActor3.ApplyConstraint(Constraint::New<Quaternion>( Actor::Property::ORIENTATION, angleSrc,
                                                               RotationConstraint(+1.0f)));
     mSceneAnimation = Animation::New(2.5f);
@@ -343,7 +344,7 @@ public:
             mLightLongitudinal += gesture.displacement.x/4.0f;
             mLightAxisTilt -= gesture.displacement.y/6.0f;
             mLightAxisTilt = Clamp<float>(mLightAxisTilt, -90.0f, 90.0f);
-            mLightAnchor.SetRotation(CalculateWorldRotation(Radian(mLightLongitudinal), Radian(mLightAxisTilt)));
+            mLightAnchor.SetOrientation(CalculateWorldRotation(Radian(mLightLongitudinal), Radian(mLightAxisTilt)));
             break;
           }
@@ -359,7 +360,7 @@ public:
             mLongitudinal += gesture.displacement.x/4.0f;
             mAxisTilt -= gesture.displacement.y/6.0f;
             mAxisTilt = Clamp<float>(mAxisTilt, -90.0f, 90.0f);
-            mContents.SetRotation(CalculateWorldRotation(Radian(mLongitudinal), Radian(mAxisTilt)));
+            mContents.SetOrientation(CalculateWorldRotation(Radian(mLongitudinal), Radian(mAxisTilt)));
             break;
           }
@@ -368,7 +369,7 @@ public:
             mObjectLongitudinal += gesture.displacement.x/4.0f;
             mObjectAxisTilt -= gesture.displacement.y/6.0f;
             mObjectAxisTilt = Clamp<float>(mObjectAxisTilt, -90.0f, 90.0f);
-            mSceneActor.SetRotation(CalculateWorldRotation(Radian(mObjectLongitudinal), Radian(mObjectAxisTilt)));
+            mSceneActor.SetOrientation(CalculateWorldRotation(Radian(mObjectLongitudinal), Radian(mObjectAxisTilt)));
             break;
           }
         }
@@ -460,7 +461,7 @@ public:
     // Align scene so that light anchor orientation is Z Axis
     mAxisTilt = -mLightAxisTilt;
     mLongitudinal = -mLightLongitudinal;
-    mContents.SetRotation(CalculateWorldRotation(Radian(mLongitudinal), Radian(mAxisTilt)));
+    mContents.SetOrientation(CalculateWorldRotation(Radian(mLongitudinal), Radian(mAxisTilt)));
     return true;
   }
+/*
+ * 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::TextView::New();
+    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.SetText( std::string( TOOLBAR_TITLE ) + ": " + subTitle );
+    mTitleActor.SetStyleToCurrentText( DemoHelper::GetDefaultTextStyle() );
+  }
+
+  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();
+
+      Toolkit::TextView text = Toolkit::TextView::New();
+      text.SetName( "POPUP_CONTENT_TEXT" );
+      text.SetText( CONTENT_TEXT );
+      text.SetMultilinePolicy( Toolkit::TextView::SplitByWord );
+      text.SetWidthExceedPolicy( Toolkit::TextView::Split );
+      text.SetLineJustification( Toolkit::TextView::Center );
+      text.SetResizePolicy( FILL_TO_PARENT, WIDTH );
+      text.SetDimensionDependency( HEIGHT, WIDTH );
+      text.SetPadding( Padding( 20.0f, 20.0f, 20.0f, 20.0f ) );
+
+      mPopup.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!" );
+
+      Toolkit::TextView text = Toolkit::TextView::New();
+      text.SetName( "POPUP_CONTENT_TEXT" );
+      text.SetText( CONTENT_TEXT );
+      text.SetMultilinePolicy( Toolkit::TextView::SplitByWord );
+      text.SetWidthExceedPolicy( Toolkit::TextView::Split );
+      text.SetLineJustification( Toolkit::TextView::Center );
+      text.SetResizePolicy( FILL_TO_PARENT, WIDTH );
+      text.SetDimensionDependency( HEIGHT, WIDTH );
+      text.SetPadding( Padding( 20.0f, 20.0f, 20.0f, 20.0f ) );
+
+      mPopup.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!" );
+
+      Toolkit::TextView text = Toolkit::TextView::New();
+      text.SetName( "POPUP_CONTENT_TEXT" );
+      text.SetText( CONTENT_TEXT );
+      text.SetMultilinePolicy( Toolkit::TextView::SplitByWord );
+      text.SetWidthExceedPolicy( Toolkit::TextView::Split );
+      text.SetLineJustification( Toolkit::TextView::Left );
+      text.SetResizePolicy( FILL_TO_PARENT, WIDTH );
+      text.SetDimensionDependency( HEIGHT, WIDTH );
+      text.SetPadding( Padding( 10.0f, 10.0f, 20.0f, 0.0f ) );
+
+      mPopup.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::TextView text = Toolkit::TextView::New();
+        text.SetText( "Do you really want to quit?" );
+        text.SetMultilinePolicy( Toolkit::TextView::SplitByWord );
+        text.SetWidthExceedPolicy( Toolkit::TextView::Split );
+        text.SetLineJustification( Toolkit::TextView::Left );
+        text.SetResizePolicy( FILL_TO_PARENT, WIDTH );
+        text.SetDimensionDependency( HEIGHT, WIDTH );
+
+        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::TextView text = Toolkit::TextView::New();
+        text.SetText( "Don't show again" );
+        text.SetLineJustification( Toolkit::TextView::Left );
+        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 );
+        TextActor text = TextActor::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 );
+        TextActor text = TextActor::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 );
+        TextActor text = TextActor::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 );
+        TextActor text = TextActor::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 );
+        TextActor text = TextActor::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 );
+        TextActor text = TextActor::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 ) );
+
+        TextActor text = TextActor::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 );
+
+        TextActor text = TextActor::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 ) );
+
+        TextActor text = TextActor::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 );
+
+        TextActor text = TextActor::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 ) );
+
+        TextActor text = TextActor::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 );
+
+        TextActor text = TextActor::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 ) );
+
+        TextActor text = TextActor::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 ) );
+
+        TextActor text = TextActor::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 ) );
+
+        TextActor text = TextActor::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 ) );
+
+        TextActor text = TextActor::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 ) );
+
+        TextActor text = TextActor::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 );
+
+        TextActor text = TextActor::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 ) );
+
+        TextActor text = TextActor::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::TextView 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;
+}
@@ -75,14 +75,14 @@ const TableString TABLE_STRINGS[] = { { &quot;HelveticaNue&quot;, &quot;Regular&quot;,  8.0f,       
                                       { "HelveticaNue", "Regular",  12.0f,           Dali::TextStyle::REGULAR,    Vector4( 0.5f, 1.0f, 1.0f, 1.0f ),    "Hola",                       Toolkit::Alignment::HorizontalCenter, Toolkit::Alignment::VerticalCenter, 10.0f,    90.0f,        { 2, 0, 4, 2 } },
                                       { "HelveticaNue", "Regular",  18.0f,           Dali::TextStyle::BOLD,       Vector4( 0.5f, 1.0f, 0.5f, 1.0f ),    "Bonjour",                    Toolkit::Alignment::HorizontalCenter, Toolkit::Alignment::VerticalTop,    10.0f,    0.0f,         { 2, 2, 2, 4 } },
                                       { "HelveticaNue", "Regular",  12.0f,           Dali::TextStyle::REGULAR,    Vector4( 1.0f, 1.0f, 0.5f, 1.0f ),    "Ciao",                       Toolkit::Alignment::HorizontalCenter, Toolkit::Alignment::VerticalCenter, 10.0f,    0.0f,         { 2, 7, 2, 3 } },
-                                      { "HelveticaNue", "Regular",  26.0f,           Dali::TextStyle::EXTRABLACK, Vector4( 0.5f, 0.0f, 0.0f, 1.0f ),    "Hello",                      Toolkit::Alignment::HorizontalCenter, Toolkit::Alignment::VerticalCenter, 10.0f,    0.0f,         { 4, 2, 1, 6 } },
+                                      { "HelveticaNue", "Regular",  23.0f,           Dali::TextStyle::EXTRABLACK, Vector4( 0.5f, 0.0f, 0.0f, 1.0f ),    "안녕하세요",                                        Toolkit::Alignment::HorizontalCenter, Toolkit::Alignment::VerticalCenter, 20.0f,    0.0f,         { 4, 3, 1, 6 } },
                                       { "HelveticaNue", "Regular",  8.0f,            Dali::TextStyle::DEMIBOLD,   Vector4( 0.0f, 0.5f, 0.0f, 1.0f ),    "Top of the morning to you",  Toolkit::Alignment::HorizontalCenter, Toolkit::Alignment::VerticalCenter, 10.0f,    90.0f,        { 4, 10, 8, 2 } },
-                                      { "HelveticaNue", "Regular",  13.0f,           Dali::TextStyle::DEMIBOLD,   Vector4( 1.0f, 1.0f, 1.0f, 1.0f ),    "हैलो",                                                   Toolkit::Alignment::HorizontalCenter, Toolkit::Alignment::VerticalTop,    10.0f,    0.0f,         { 6, 1, 1, 3 } },
+                                      { "HelveticaNue", "Regular",  13.0f,           Dali::TextStyle::DEMIBOLD,   Vector4( 1.0f, 1.0f, 1.0f, 1.0f ),    "हैलो",                                                   Toolkit::Alignment::HorizontalCenter, Toolkit::Alignment::VerticalTop,          10.0f,    0.0f,         { 6, 1, 1, 3 } },
                                       { "HelveticaNue", "Regular",  8.0f,            Dali::TextStyle::DEMIBOLD,   Vector4( 1.0f, 1.0f, 0.0f, 1.0f ),    "สวัสดี",                       Toolkit::Alignment::HorizontalCenter, Toolkit::Alignment::VerticalTop,    10.0f,    90.0f,        { 6, 5, 2, 1 } },
                                       { "HelveticaNue", "Regular",  18.0f,           Dali::TextStyle::REGULAR,    Vector4( 0.0f, 1.0f, 1.0f, 1.0f ),    "你好",                        Toolkit::Alignment::HorizontalCenter, Toolkit::Alignment::VerticalBottom, 10.0f,    0.0f,         { 6, 6, 1, 3 } },
                                       { "HelveticaNue", "Regular",  34.0f,           Dali::TextStyle::REGULAR,    Vector4( 0.0f, 0.0f, 1.0f, 1.0f ),    "G'day",                      Toolkit::Alignment::HorizontalCenter, Toolkit::Alignment::VerticalCenter, 10.0f,    0.0f,         { 7, 0, 2, 10 } },
                                       { "HelveticaNue", "Regular",  16.0f,           Dali::TextStyle::EXTRABLACK, Vector4( 0.0f, 0.5f, 1.0f, 1.0f ),    "مرحبا",                      Toolkit::Alignment::HorizontalCenter, Toolkit::Alignment::VerticalTop,    10.0f,    0.0f,         { 9, 1, 2, 4 } },
-                                      { "HelveticaNue", "Regular",  10.0f,           Dali::TextStyle::EXTRABLACK, Vector4( 1.0f, 0.0f, 0.0f, 1.0f ),    "こんにちは",                                         Toolkit::Alignment::HorizontalCenter, Toolkit::Alignment::VerticalCenter, 10.0f,    0.0f,         { 10, 0, 2, 6 } },
+                                      { "HelveticaNue", "Regular",  10.0f,           Dali::TextStyle::EXTRABLACK, Vector4( 1.0f, 0.0f, 0.0f, 1.0f ),    "こんにちは",                                         Toolkit::Alignment::HorizontalCenter, Toolkit::Alignment::VerticalCenter,      10.0f,    0.0f,         { 10, 0, 2, 6 } },
                                       { "HelveticaNue", "Regular",  14.0f,           Dali::TextStyle::REGULAR,    Vector4( 0.0f, 1.0f, 0.0f, 1.0f ),    "aloha",                      Toolkit::Alignment::HorizontalCenter, Toolkit::Alignment::VerticalTop,    10.0f,    0.0f,         { 10, 6, 2, 4 } }
                                     };
@@ -132,7 +132,7 @@ public:
     textContainer.SetParentOrigin( ParentOrigin::TOP_LEFT );
     textContainer.SetAnchorPoint( AnchorPoint::TOP_LEFT );
     textContainer.SetPosition( 0, TOOLBAR_HEIGHT );
-    textContainer.SetSize( stage.GetSize().width, stage.GetSize().height - TOOLBAR_HEIGHT );
+    textContainer.SetPreferredSize( Vector2( stage.GetSize().width, stage.GetSize().height - TOOLBAR_HEIGHT ) );
     mContentLayer.Add( textContainer );
@@ -150,11 +150,13 @@ public:
       Toolkit::TextView textView = Toolkit::TextView::New( tableString.text );
       textView.SetStyleToCurrentText( textStyle );
-      textView.SetRotation( Dali::Degree( tableString.orientation ), Vector3( 0.0f, 0.0f, 1.0f ) );
+      textView.SetOrientation( Dali::Degree( tableString.orientation ), Vector3( 0.0f, 0.0f, 1.0f ) );
+      textView.SetResizePolicy( USE_NATURAL_SIZE, ALL_DIMENSIONS );
       Toolkit::Alignment alignmentContainer = Toolkit::Alignment::New( tableString.horizontalAlignment, tableString.verticalAlignment );
-      alignmentContainer.SetPadding( Toolkit::Alignment::Padding( tableString.padding, tableString.padding, tableString.padding, tableString.padding ) );
-      alignmentContainer.SetScaling( Toolkit::Alignment::ScaleToFill );
+      Actor alignmentContainerActor = alignmentContainer;
+      alignmentContainerActor.SetPadding( Padding( tableString.padding, tableString.padding, tableString.padding, tableString.padding ) );
+      alignmentContainer.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS );
       alignmentContainer.Add( textView );
       textContainer.AddChild( alignmentContainer, Toolkit::TableView::CellPosition( tableString.cellPosition.row, tableString.cellPosition.column, tableString.cellPosition.rowSpan, tableString.cellPosition.columnSpan ) );
@@ -189,7 +191,7 @@ void RunTest( Application&amp; application )
   application.MainLoop();
 }
-// Entry point for Linux & SLP applications
+// Entry point for Linux & Tizen applications
 //
 int main( int argc, char **argv )
 {
@@ -2,7 +2,7 @@
 Name:       com.samsung.dali-demo
 Summary:    The OpenGLES Canvas Core Demo
-Version:    1.0.32
+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": [
@@ -59,7 +59,7 @@
       "duration": 10.0,
       "properties": [{
         "actor": "image", // referenced actors must exist on stage
-        "property": "rotation",
+        "property": "orientation",
         "value": [0, 0, -45],
         "alpha-function": "EASE_IN_OUT",
         "time-period": {
@@ -90,7 +90,7 @@
     "styles": ["basic-text"],
     "position": [0, -120, 0],
     "size": [200, 200, 1],
-    "rotation": [0, 0, 30],
+    "orientation": [0, 0, 30],
     "signals": [{
       "name": "touched",
       "action": "play",
@@ -102,7 +102,7 @@
     "parent-origin": "CENTER",
     "anchor-point": "CENTER",
     "size": [200, 200, 1],
-    "rotation": [0, 0, 39],
+    "orientation": [0, 0, 39],
     "position": [-150, -50, 0],
     "text": "or me",
     "signals": [{
@@ -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();
@@ -84,10 +84,12 @@ Dali::Layer CreateToolbar( Dali::Toolkit::ToolBar&amp; toolBar,
                            const Dali::TextStyle& textStyle )
 {
   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();
@@ -95,12 +97,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.
@@ -112,7 +116,7 @@ Dali::Layer CreateToolbar( Dali::Toolkit::ToolBar&amp; toolBar,
   if( !title.empty() )
   {
     Dali::Toolkit::TextView titleActor = Dali::Toolkit::TextView::New();
-    titleActor.SetName( "ToolbarTitle" );
+    titleActor.SetName( "TOOLBAR_TITLE" );
     titleActor.SetText( title );
     titleActor.SetSize( font.MeasureText( title ) );
     titleActor.SetStyleToCurrentText(textStyle);
@@ -138,14 +142,19 @@ 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 );
-  // Set background image.
-  if ( ! backgroundImagePath.empty() )
+  // Set background image, loading it at screen resolution:
+  if ( !backgroundImagePath.empty() )
   {
-    Dali::Image backgroundImage = Dali::ResourceImage::New( backgroundImagePath );
+    Dali::ImageAttributes backgroundAttributes;
+    backgroundAttributes.SetSize( stage.GetSize() );
+    backgroundAttributes.SetFilterMode( Dali::ImageAttributes::BoxThenLinear );
+    backgroundAttributes.SetScalingMode( Dali::ImageAttributes::ScaleToFill );
+    Dali::Image backgroundImage = Dali::ResourceImage::New( backgroundImagePath, backgroundAttributes );
     Dali::ImageActor backgroundImageActor = Dali::ImageActor::New( backgroundImage );
     view.SetBackground( backgroundImageActor );
   }
@@ -160,13 +169,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 );