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

Conflicts:
	automated-tests/src/dali-toolkit/utc-Dali-Cluster.cpp
	automated-tests/src/dali-toolkit/utc-Dali-ControlImpl.cpp
	automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp
	automated-tests/src/dali-toolkit/utc-Dali-TableView.cpp
	automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp
	automated-tests/src/dali-toolkit/utc-Dali-TextLabel.cpp
	automated-tests/src/dali-toolkit/utc-Dali-View.cpp
	dali-toolkit/internal/controls/buttons/button-impl.cpp
	dali-toolkit/internal/controls/buttons/push-button-impl.cpp
	dali-toolkit/internal/controls/buttons/push-button-impl.h
	dali-toolkit/internal/controls/cluster/cluster-impl.cpp
	dali-toolkit/internal/controls/cluster/cluster-style-impl.cpp
	dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp
	dali-toolkit/internal/controls/popup/popup-impl.cpp
	dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp
	dali-toolkit/internal/controls/scroll-component/scroll-bar-internal-impl.cpp
	dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.cpp
	dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.h
	dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp
	dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp
	dali-toolkit/internal/controls/scrollable/scrollable-impl.h
	dali-toolkit/internal/controls/shadow-view/shadow-view-impl.cpp
	dali-toolkit/internal/controls/slider/slider-impl.cpp
	dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
	dali-toolkit/internal/controls/text-controls/text-field-impl.h
	dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
	dali-toolkit/internal/controls/text-controls/text-label-impl.h
	dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp
	dali-toolkit/internal/controls/view/view-impl.cpp
	dali-toolkit/internal/controls/view/view-impl.h
	dali-toolkit/internal/file.list
	dali-toolkit/internal/text/clipping/text-clipper.cpp
	dali-toolkit/internal/text/decorator/text-decorator.cpp
	dali-toolkit/internal/text/decorator/text-decorator.h
	dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp
	dali-toolkit/internal/text/text-control-interface.h
	dali-toolkit/internal/text/text-controller.cpp
	dali-toolkit/internal/text/text-controller.h
	dali-toolkit/internal/transition-effects/cube-transition-cross-effect-impl.cpp
	dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp
	dali-toolkit/internal/transition-effects/cube-transition-fold-effect-impl.cpp
	dali-toolkit/internal/transition-effects/cube-transition-wave-effect-impl.cpp
	dali-toolkit/public-api/controls/buttons/push-button.cpp
	dali-toolkit/public-api/controls/cluster/cluster-style.cpp
	dali-toolkit/public-api/controls/control-impl.cpp
	dali-toolkit/public-api/controls/scrollable/item-view/grid-layout.cpp
	dali-toolkit/public-api/controls/scrollable/item-view/item-layout.cpp
	dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h
	dali-toolkit/public-api/controls/text-controls/text-field.cpp
	dali-toolkit/public-api/controls/text-controls/text-field.h
	dali-toolkit/public-api/controls/view/view.h
	dali-toolkit/public-api/dali-toolkit-version.cpp
	docs/content/programming-guide/animation-example.h
	docs/content/programming-guide/animation-rotation.h
	docs/content/programming-guide/dynamics-bodies.h
	docs/content/programming-guide/size-negotiation.h
	packaging/dali-toolkit.spec
	plugins/dali-script-v8/src/object/property-value-wrapper.cpp

Change-Id: I5a0a9bc20a55ebcc9605c24d9ce1e688f0e6b9cc

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-PageTurnView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-PageTurnView.cpp
index 443de6f..955f19d 100644 (file)
--- a/automated-tests/src/dali-toolkit/utc-Dali-PageTurnView.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-PageTurnView.cpp
@@ -371,6 +371,7 @@ int UtcDaliPageTurnViewEnterLeaveEditMode(void)
   factory.EnableOffscreenRendering( );
 
   PageTurnView pageTurnView = PageTurnLandscapeView::New( factory, PAGE_SIZE );
+  pageTurnView.SetRelayoutEnabled( false );
   pageTurnView.SetPositionInheritanceMode( USE_PARENT_POSITION );
   Stage::GetCurrent().Add( pageTurnView );
 
@@ -422,6 +423,7 @@ int UtcDaliPageTurnViewGetHitActor(void)
   factory.EnableOffscreenRendering( );
 
   PageTurnView pageTurnView = PageTurnPortraitView::New( factory, PAGE_SIZE );
+  pageTurnView.SetRelayoutEnabled( false );
   pageTurnView.SetParentOrigin( ParentOrigin::TOP_LEFT );
   pageTurnView.SetAnchorPoint( AnchorPoint::TOP_LEFT );
   Stage::GetCurrent().Add( pageTurnView );
@@ -458,6 +460,7 @@ int UtcDaliPageTurnViewRefresh(void)
   TestPageFactory factory(application);
   factory.EnableOffscreenRendering( );
   PageTurnView pageTurnView = PageTurnPortraitView::New( factory, PAGE_SIZE );
+  pageTurnView.SetRelayoutEnabled( false );
   pageTurnView.SetParentOrigin( ParentOrigin::TOP_LEFT );
   pageTurnView.SetAnchorPoint( AnchorPoint::TOP_LEFT );
   Stage::GetCurrent().Add( pageTurnView );
@@ -498,6 +501,7 @@ int UtcDaliPageTurnViewSignals(void)
   TestPageFactory factory(application);
   Vector2 size = Stage::GetCurrent().GetSize();
   PageTurnView portraitView = PageTurnPortraitView::New( factory, size );
+  portraitView.SetRelayoutEnabled( false );
   portraitView.SetPositionInheritanceMode( USE_PARENT_POSITION );
   Stage::GetCurrent().Add( portraitView );
 

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp b/automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp
index 4b62045..b2f0324 100644 (file)
--- a/automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp
@@ -295,9 +295,6 @@ int UtcDaliPushButtonSetImages(void)
 
   size = pushButton.GetCurrentSize();
 
-  DALI_TEST_EQUALS( size.width, 20.f, TEST_LOCATION );
-  DALI_TEST_EQUALS( size.height, 20.f, TEST_LOCATION );
-
   END_TEST;
 }
 

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-SuperBlurView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-SuperBlurView.cpp
index ed651ad..b7e662e 100644 (file)
--- a/automated-tests/src/dali-toolkit/utc-Dali-SuperBlurView.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-SuperBlurView.cpp
@@ -197,6 +197,7 @@ int UtcDaliSuperBlurViewGetBlurredImage(void)
   tet_infoline( "UtcDaliSuperBlurViewGetBlurredImage" );
 
   SuperBlurView blurView = SuperBlurView::New( BLUR_LEVELS );
+  blurView.SetRelayoutEnabled( false );
   blurView.SetSize( 100.f,100.f );
   Image inputImage = CreateSolidColorImage( application, Color::GREEN, 100, 100 );
   blurView.SetImage( inputImage );

diff --git a/docs/content/programming-guide/size-negotiation.h b/docs/content/programming-guide/size-negotiation.h
index 92beacd..334c709 100644 (file)
--- a/docs/content/programming-guide/size-negotiation.h
+++ b/docs/content/programming-guide/size-negotiation.h
@@ -244,7 +244,7 @@ PushButton, OKAY_BUTTON - Pos: [185, 0, 0.1] Size: [165, 76, 76], Dirty: (FALSE,
 
 The format is as follows:
 
-[Actor type], [Actor name] – Pos:[X, Y, Z] Size[Dimension::WIDTH, Dimension::HEIGHT, DEPTH], Dirty:(Dimension::WIDTH, Dimension::HEIGHT), Negotiated: (Dimension::WIDTH, Dimension::HEIGHT), Enabled: BOOLEAN, (Object address)
+[Actor type], [Actor name] ? Pos:[X, Y, Z] Size[Dimension::WIDTH, Dimension::HEIGHT, DEPTH], Dirty:(Dimension::WIDTH, Dimension::HEIGHT), Negotiated: (Dimension::WIDTH, Dimension::HEIGHT), Enabled: BOOLEAN, (Object address)
 - <i>Actor type</i>: The type name of the actor E.g. PushButton
 - <i>Actor name</i>: The name set on the actor with SetName(). Useful for debugging.
 - <i>Pos</i>: The position of the actor