[dali_1.0.41] Merge branch 'tizen'

Change-Id: I5ed50dd8faa1c132908926253f5dfdad40b2564a

[dali_1.0.41] Merge branch 'tizen'
Change-Id: I5ed50dd8faa1c132908926253f5dfdad40b2564a
Nick Holland
2 parents 7221d1a5 f57b971d
Showing 2 changed files with 2 additions and 1 deletions
examples/text-field/text-field-example.cpp
packaging/com.samsung.dali-demo.spec
@@ -121,6 +121,7 @@ public:
     mField.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
     mField.SetResizePolicy( ResizePolicy::DIMENSION_DEPENDENCY, Dimension::HEIGHT );
     mField.SetProperty( TextField::Property::PLACEHOLDER_TEXT, "Unnamed folder" );
+    mField.SetProperty( TextField::Property::PLACEHOLDER_TEXT_FOCUSED, "Enter folder name." );
     mField.SetProperty( TextField::Property::DECORATION_BOUNDING_BOX, Rect<int>( BORDER_WIDTH, BORDER_WIDTH, stageSize.width - BORDER_WIDTH*2, stageSize.height - BORDER_WIDTH*2 ) );
  
     container.Add( mField );
@@ -2,7 +2,7 @@
  
 Name:       com.samsung.dali-demo
 Summary:    The OpenGLES Canvas Core Demo
-Version:    1.0.40
+Version:    1.0.41
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0