[dali_1.3.49] Merge branch 'devel/master'

Change-Id: I353ae06a2b7246e2374e490271d79f7f40281739

[dali_1.3.49] Merge branch 'devel/master'
Change-Id: I353ae06a2b7246e2374e490271d79f7f40281739
Victor Cebollada
2 parents 5e2c2e26 9c90024e
Showing 10 changed files with 281 additions and 56 deletions
com.samsung.dali-demo.xml
examples-reel/dali-examples-reel.cpp
examples/animated-gradient-call-active/animated-gradient-call-active.cpp
examples/layouting/animation-example.cpp
examples/layouting/animation-example.h
examples/web-view/web-view-example.cpp
packaging/com.samsung.dali-demo.spec
resources/po/en_GB.po
resources/po/en_US.po
shared/dali-demo-strings.h
@@ -272,6 +272,9 @@
 	<ui-application appid="pre-render-callback.example" exec="/usr/apps/com.samsung.dali-demo/bin/pre-render-callback.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
 		<label>Frame Callback</label>
 	</ui-application>
+	<ui-application appid="web-view.example" exec="/usr/apps/com.samsung.dali-demo/bin/web-view.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
+		<label>Web View</label>
+	</ui-application>
 	<privileges>
 		<privilege>http://tizen.org/privilege/mediastorage</privilege>
@@ -89,6 +89,7 @@ int DALI_EXPORT_API main(int argc, char **argv)
   demo.AddExample(Example("tilt.example", DALI_DEMO_STR_TITLE_TILT_SENSOR));
   demo.AddExample(Example("tooltip.example", DALI_DEMO_STR_TITLE_TOOLTIP));
   demo.AddExample(Example("transitions.example", DALI_DEMO_STR_TITLE_VISUAL_TRANSITIONS));
+  demo.AddExample(Example("web-view.example", DALI_DEMO_STR_TITLE_WEB_VIEW));
   demo.SortAlphabetically( true );
@@ -211,6 +211,8 @@ private:
     mCallStartButton.ClickedSignal().Connect( this, &CallController::OnButtonClicked );
     mCallStartButton.SetProperty( DevelButton::Property::SELECTED_BACKGROUND_VISUAL, ICON_CALL_IMAGE );
     mCallStartButton.SetProperty( DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, ICON_CALL_IMAGE );
+    mCallStartButton.SetProperty( Control::Property::BACKGROUND, ICON_CALL_IMAGE );
+    mCallStartButton.SetLabelText("");
     mStage.Add( mCallStartButton );
     mStage.Add( mButtonIconDecall );
@@ -291,6 +293,7 @@ private:
     mCallEndButton.SetProperty( DevelButton::Property::SELECTED_BACKGROUND_VISUAL, "" );
     mCallEndButton.SetProperty( DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, "" );
     mCallEndButton.SetStyleName( DECLINE_BUTTON_STYLE_STR );
+    mCallEndButton.SetLabelText("");
     mButtonClip.Add( mCallEndButton );
     mButtonClip.Add( mButtonIcon );
@@ -22,6 +22,7 @@
 #include <dali-toolkit/devel-api/controls/control-devel.h>
 #include <dali-toolkit/devel-api/layouting/linear-layout.h>
 #include <dali-toolkit/devel-api/layouting/grid.h>
+#include <dali-toolkit/devel-api/focus-manager/keyinput-focus-manager.h>
 #include <dali/integration-api/debug.h>
@@ -59,24 +60,24 @@ Debug::Filter* gLayoutFilter = Debug::Filter::New( Debug::NoLogging, false, &quot;LOG
 const unsigned int NUMBER_OF_RESOURCES = sizeof(IMAGE_PATH) / sizeof(char*);
-// Helper function to create ImageViews with given filename and size.
-void CreateChildImageView( ImageView& imageView, int index, Size size )
+// Helper function
+void CreateChild( ImageView& child, int index, Size size )
 {
-  imageView = ImageView::New();
+  child = ImageView::New();
   Property::Map imagePropertyMap;
   imagePropertyMap[ Toolkit::Visual::Property::TYPE ] = Toolkit::Visual::IMAGE;
   imagePropertyMap[ Toolkit::ImageVisual::Property::URL ] = IMAGE_PATH[ index ];
   imagePropertyMap[ ImageVisual::Property::DESIRED_WIDTH ] = size.width;
   imagePropertyMap[ ImageVisual::Property::DESIRED_HEIGHT ] = size.height;
-  imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, imagePropertyMap );
+  child.SetProperty( Toolkit::ImageView::Property::IMAGE, imagePropertyMap );
   std::string name = "ImageView";
   name.append( 1, '0' + index );
-  imageView.SetName( name );
-  imageView.SetAnchorPoint( AnchorPoint::TOP_LEFT );
-  imageView.SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS );
+  child.SetName( name );
+  child.SetAnchorPoint( AnchorPoint::TOP_LEFT );
 }
-LayoutTransitionData CreateOnSetLayoutTransition( Control& parent, std::vector< Toolkit::ImageView >& children )
+// Create set layout transition. A parent opacity increases 'ease in out' from semi-transparent to fully opaque and children pulse in order
+LayoutTransitionData CreateOnSetLayoutTransition( Control& container )
 {
   auto layoutTransitionData = LayoutTransitionData::New();
   Property::Map map;
@@ -84,31 +85,32 @@ LayoutTransitionData CreateOnSetLayoutTransition( Control&amp; parent, std::vector&lt; 
   map[ LayoutTransitionData::AnimatorKey::INITIAL_VALUE ] = 0.5f;
   map[ LayoutTransitionData::AnimatorKey::TARGET_VALUE ] = 1.0f;
   map[ LayoutTransitionData::AnimatorKey::ANIMATOR ] = Property::Map()
-    .Add( LayoutTransitionData::AnimatorKey::ALPHA_FUNCTION, "EASE_IN_OUT" )
+    .Add( LayoutTransitionData::AnimatorKey::ALPHA_FUNCTION, AlphaFunction::EASE_IN_OUT )
     .Add( LayoutTransitionData::AnimatorKey::TIME_PERIOD, Property::Map()
       .Add( LayoutTransitionData::AnimatorKey::DELAY, 0.25f )
       .Add( LayoutTransitionData::AnimatorKey::DURATION, 0.5f ) );
   // Apply to parent only
-  layoutTransitionData.AddPropertyAnimator( parent, map );
+  layoutTransitionData.AddPropertyAnimator( container, map );
-  for( size_t i = 0; i < children.size(); i++ )
+  for( size_t i = 0; i < container.GetChildCount(); i++ )
   {
     Property::Map map;
     map[ LayoutTransitionData::AnimatorKey::PROPERTY ] = Actor::Property::SIZE;
     map[ LayoutTransitionData::AnimatorKey::TARGET_VALUE ] = Vector3( 100.0f * 1.2f, 100.0f * 1.2f, 0 );
     map[ LayoutTransitionData::AnimatorKey::ANIMATOR ] = Property::Map()
-      .Add( LayoutTransitionData::AnimatorKey::ALPHA_FUNCTION, "SIN" )
+      .Add( LayoutTransitionData::AnimatorKey::ALPHA_FUNCTION, AlphaFunction::SIN )
       .Add( LayoutTransitionData::AnimatorKey::TIME_PERIOD, Property::Map()
         .Add( LayoutTransitionData::AnimatorKey::DELAY, 0.5f + 0.1f * i)
         .Add( LayoutTransitionData::AnimatorKey::DURATION, 0.25f ) );
-    layoutTransitionData.AddPropertyAnimator( children[i], map );
+    layoutTransitionData.AddPropertyAnimator( container.GetChildAt( i ), map );
   }
   return layoutTransitionData;
 }
-LayoutTransitionData CreateOnChildAddTransition( Control& parent, ImageView& child )
+// Create add child transition. An added child grows from (0, 0) to its full size and instantly appears in its position
+LayoutTransitionData CreateOnChildAddTransition( Control& parent )
 {
   auto layoutTransitionData = LayoutTransitionData::New();
@@ -116,7 +118,7 @@ LayoutTransitionData CreateOnChildAddTransition( Control&amp; parent, ImageView&amp; chi
   Property::Map map;
   map[ LayoutTransitionData::AnimatorKey::PROPERTY ] = Actor::Property::SIZE;
   map[ LayoutTransitionData::AnimatorKey::ANIMATOR ] = Property::Map()
-    .Add( LayoutTransitionData::AnimatorKey::ALPHA_FUNCTION, "LINEAR")
+    .Add( LayoutTransitionData::AnimatorKey::ALPHA_FUNCTION, AlphaFunction::LINEAR )
     .Add( LayoutTransitionData::AnimatorKey::TIME_PERIOD, Property::Map()
       .Add( LayoutTransitionData::AnimatorKey::DELAY, 0.0f )
       .Add( LayoutTransitionData::AnimatorKey::DURATION, 0.0f ) );
@@ -125,62 +127,129 @@ LayoutTransitionData CreateOnChildAddTransition( Control&amp; parent, ImageView&amp; chi
   // New child is growing
   {
     Property::Map map;
+    map[ LayoutTransitionData::AnimatorKey::CONDITION ] = LayoutTransitionData::Condition::ON_ADD;
     map[ LayoutTransitionData::AnimatorKey::PROPERTY ] = Actor::Property::SIZE;
-    map["initialValue"] = Vector3( 0.0f, 0.0f, 0 );
+    map[ LayoutTransitionData::AnimatorKey::INITIAL_VALUE ] = Vector3( 0.0f, 0.0f, 0 );
     map[ LayoutTransitionData::AnimatorKey::TARGET_VALUE ] = Vector3( 100.0f, 100.0f, 0 );
     map[ LayoutTransitionData::AnimatorKey::ANIMATOR ] = Property::Map()
-      .Add( LayoutTransitionData::AnimatorKey::ALPHA_FUNCTION, "LINEAR")
+      .Add( LayoutTransitionData::AnimatorKey::ALPHA_FUNCTION, AlphaFunction::LINEAR )
       .Add( LayoutTransitionData::AnimatorKey::TIME_PERIOD, Property::Map()
         .Add( LayoutTransitionData::AnimatorKey::DELAY, 0.0f )
         .Add( LayoutTransitionData::AnimatorKey::DURATION, 0.5f ) );
-    layoutTransitionData.AddPropertyAnimator( child, map );
+    layoutTransitionData.AddPropertyAnimator( Actor(), map );
   }
   // Want new children instantly appear in their positions
   {
     Property::Map map;
-    map[ LayoutTransitionData::AnimatorKey::PROPERTY] = Actor::Property::POSITION;
-    map[ LayoutTransitionData::AnimatorKey::ANIMATOR] = Property::Map()
-      .Add( LayoutTransitionData::AnimatorKey::ALPHA_FUNCTION, "LINEAR")
+    map[ LayoutTransitionData::AnimatorKey::CONDITION ] = LayoutTransitionData::Condition::ON_ADD;
+    map[ LayoutTransitionData::AnimatorKey::PROPERTY ] = Actor::Property::POSITION;
+    map[ LayoutTransitionData::AnimatorKey::ANIMATOR ] = Property::Map()
+      .Add( LayoutTransitionData::AnimatorKey::ALPHA_FUNCTION, AlphaFunction::LINEAR )
       .Add( LayoutTransitionData::AnimatorKey::TIME_PERIOD, Property::Map()
          .Add( LayoutTransitionData::AnimatorKey::DELAY, 0.0f )
          .Add( LayoutTransitionData::AnimatorKey::DURATION, 0.0f ) );
-    layoutTransitionData.AddPropertyAnimator( child, map );
+    layoutTransitionData.AddPropertyAnimator( Actor(), map );
   }
   return layoutTransitionData;
 }
-LayoutTransitionData CreateOnChildRemoveTransition(std::vector< Toolkit::ImageView >& images)
+// Create remove child transition. Remaining children shake around their positions
+LayoutTransitionData CreateOnChildRemoveTransition( Control& container )
 {
   auto layoutTransitionData = LayoutTransitionData::New();
+
   // Apply animation to remaining children
-  for (unsigned int i = 0; i < images.size(); i++)
+  Property::Map map;
+  map[ LayoutTransitionData::AnimatorKey::PROPERTY ] = Actor::Property::POSITION;
+  map[ LayoutTransitionData::AnimatorKey::ANIMATOR ] = Property::Map()
+    .Add( LayoutTransitionData::AnimatorKey::ALPHA_FUNCTION, AlphaFunction::SIN )
+    .Add( LayoutTransitionData::AnimatorKey::TIME_PERIOD, Property::Map()
+       .Add( LayoutTransitionData::AnimatorKey::DELAY, 0.0f)
+       .Add( LayoutTransitionData::AnimatorKey::DURATION, 0.5f));
+  layoutTransitionData.AddPropertyAnimator( Actor(), map );
+
+  return layoutTransitionData;
+}
+
+// Create child focus transition. A focus gained child grows 115% and focus lost child gets its original size back
+LayoutTransitionData CreateOnChildFocusTransition( Control& parent )
+{
+  auto layoutTransitionData = LayoutTransitionData::New();
+
   {
-    {
-      Property::Map map;
-      map[ LayoutTransitionData::AnimatorKey::PROPERTY ] = "position";
-      map[ LayoutTransitionData::AnimatorKey::ANIMATOR ] = Property::Map()
-        .Add( LayoutTransitionData::AnimatorKey::ALPHA_FUNCTION, "SIN")
-        .Add( LayoutTransitionData::AnimatorKey::TIME_PERIOD, Property::Map()
-           .Add( LayoutTransitionData::AnimatorKey::DELAY, 0.0f)
-           .Add( LayoutTransitionData::AnimatorKey::DURATION, 0.5f));
-      layoutTransitionData.AddPropertyAnimator( images[i], map );
-    }
+    Property::Map map;
+    map[ LayoutTransitionData::AnimatorKey::CONDITION ] = LayoutTransitionData::Condition::ON_FOCUS_GAINED;
+    map[ LayoutTransitionData::AnimatorKey::PROPERTY ] = Actor::Property::SIZE;
+    map[ LayoutTransitionData::AnimatorKey::TARGET_VALUE ] = Vector3( 115.0f, 115.0f, 0 );
+    map[ LayoutTransitionData::AnimatorKey::ANIMATOR ] = Property::Map()
+      .Add( LayoutTransitionData::AnimatorKey::TIME_PERIOD, Property::Map()
+        .Add( LayoutTransitionData::AnimatorKey::DELAY, 0.0f )
+        .Add( LayoutTransitionData::AnimatorKey::DURATION, 0.5f ) );
+    layoutTransitionData.AddPropertyAnimator( Actor(), map );
+  }
+
+  {
+    Property::Map map;
+    map[ LayoutTransitionData::AnimatorKey::CONDITION ] = LayoutTransitionData::Condition::ON_FOCUS_LOST;
+    map[ LayoutTransitionData::AnimatorKey::PROPERTY ] = Actor::Property::SIZE;
+    map[ LayoutTransitionData::AnimatorKey::TARGET_VALUE ] = Vector3( 100.0f, 100.0f, 0 );
+    map[ LayoutTransitionData::AnimatorKey::ANIMATOR ] = Property::Map()
+      .Add( LayoutTransitionData::AnimatorKey::TIME_PERIOD, Property::Map()
+        .Add( LayoutTransitionData::AnimatorKey::DELAY, 0.0f )
+        .Add( LayoutTransitionData::AnimatorKey::DURATION, 0.5f ) );
+    layoutTransitionData.AddPropertyAnimator( Actor(), map );
   }
   return layoutTransitionData;
 }
-void CreateChildImageViewAndAdd( Control& container, int index, std::vector< Toolkit::ImageView >& images )
+// An example of custom default transition, ease in for position animation, ease out for size animation
+LayoutTransitionData CreateCustomDefaultTransition( Control& parent )
 {
-  Toolkit::ImageView imageView;
-  CreateChildImageView( imageView, index, Size( 100.0f, 100.0f ) );
-  auto layout = DevelControl::GetLayout( container );
-  layout.SetTransitionData( LayoutTransitionData::ON_CHILD_ADD, CreateOnChildAddTransition( container, imageView ) );
+  auto layoutTransitionData = LayoutTransitionData::New();
+
+  {
+    Property::Map map;
+    map[ LayoutTransitionData::AnimatorKey::PROPERTY ] = Actor::Property::POSITION;
+    map[ LayoutTransitionData::AnimatorKey::ANIMATOR ] = Property::Map()
+      .Add( LayoutTransitionData::AnimatorKey::ALPHA_FUNCTION, AlphaFunction::EASE_IN )
+      .Add( LayoutTransitionData::AnimatorKey::TIME_PERIOD, Property::Map()
+        .Add( LayoutTransitionData::AnimatorKey::DELAY, 0.0f )
+        .Add( LayoutTransitionData::AnimatorKey::DURATION, 0.5f ) );
+    layoutTransitionData.AddPropertyAnimator( parent, map );
+  }
+  {
+    Property::Map map;
+    map[ LayoutTransitionData::AnimatorKey::PROPERTY ] = Actor::Property::SIZE;
+    map[ LayoutTransitionData::AnimatorKey::ANIMATOR ] = Property::Map()
+      .Add( LayoutTransitionData::AnimatorKey::ALPHA_FUNCTION, AlphaFunction::EASE_OUT )
+      .Add( LayoutTransitionData::AnimatorKey::TIME_PERIOD, Property::Map()
+        .Add( LayoutTransitionData::AnimatorKey::DELAY, 0.0f )
+        .Add( LayoutTransitionData::AnimatorKey::DURATION, 0.5f ) );
+    layoutTransitionData.AddPropertyAnimator( parent, map );
+  }
+
+  return layoutTransitionData;
+}
+
+bool OnImageTouchCallback( Actor actor, const TouchData& event )
+{
+  KeyInputFocusManager manager = KeyInputFocusManager::Get();
+  manager.SetFocus( Control::DownCast( actor ) );
+  return true;
+}
+
+void CreateChildAndAdd( Demo::AnimationExample& animationExample, Control& container )
+{
+  Toolkit::ImageView imageView;
+  CreateChild( imageView, container.GetChildCount(), Size( 100.0f, 100.0f ) );
+  imageView.TouchSignal().Connect( &animationExample, &OnImageTouchCallback );
   container.Add( imageView );
-  images.push_back( imageView );
+
+  DevelControl::GetLayout( imageView ).SetTransitionData( Toolkit::LayoutTransitionData::ON_LAYOUT_CHANGE, CreateCustomDefaultTransition( imageView ) );
 }
 }  // namespace
@@ -249,17 +318,25 @@ void AnimationExample::Create()
   mHorizontalLayout.SetOrientation( LinearLayout::Orientation::HORIZONTAL );
   mHorizontalLayout.SetAlignment( LinearLayout::Alignment::CENTER_HORIZONTAL | LinearLayout::Alignment::CENTER_VERTICAL );
   mHorizontalLayout.SetAnimateLayout(true);
+  mHorizontalLayout.SetTransitionData( LayoutTransitionData::ON_CHILD_FOCUS, CreateOnChildFocusTransition( mAnimationContainer ) );
+  mHorizontalLayout.SetTransitionData( LayoutTransitionData::ON_CHILD_REMOVE, CreateOnChildRemoveTransition( mAnimationContainer ) );
+  mHorizontalLayout.SetTransitionData( LayoutTransitionData::ON_CHILD_ADD, CreateOnChildAddTransition( mAnimationContainer ) );
+
   DevelControl::SetLayout( mAnimationContainer, mHorizontalLayout );
   mGridLayout = Grid::New();
   mGridLayout.SetAnimateLayout(true);
   mGridLayout.SetNumberOfColumns(2);
+  mGridLayout.SetTransitionData( LayoutTransitionData::ON_CHILD_FOCUS, CreateOnChildFocusTransition( mAnimationContainer ) );
+  mGridLayout.SetTransitionData( LayoutTransitionData::ON_CHILD_REMOVE, CreateOnChildRemoveTransition( mAnimationContainer ) );
+  mGridLayout.SetTransitionData( LayoutTransitionData::ON_CHILD_ADD, CreateOnChildAddTransition( mAnimationContainer ) );
-  CreateChildImageViewAndAdd( mAnimationContainer, 0, mImages );
+  CreateChildAndAdd( *this, mAnimationContainer );
   stage.Add( mAnimationContainer );
 }
-// Remove controls added by this example from stage
+// Remove controls added by this example from stage     mGridLayout.SetTransitionData( LayoutTransitionData::ON_CHILD_FOCUS, CreateOnChildFocusTransition( mAnimationContainer ) );
+
 void AnimationExample::Remove()
 {
   if ( mAnimationContainer )
@@ -269,7 +346,6 @@ void AnimationExample::Remove()
     UnparentAndReset( mSelectGridButton );
     UnparentAndReset( mShakeButton );
     UnparentAndReset( mAnimationContainer);
-    mImages.clear();
   }
 }
@@ -277,14 +353,9 @@ bool AnimationExample::OnRemoveClicked( Button button )
 {
   DALI_LOG_INFO( gLayoutFilter, Debug::Verbose, "AnimationExample::OnRemoveClicked\n");
-  if (mImages.size() > 1)
+  if ( mAnimationContainer.GetChildCount() > 1 )
   {
-    auto layout = DevelControl::GetLayout( mAnimationContainer );
-    layout.SetTransitionData(LayoutTransitionData::ON_CHILD_REMOVE, CreateOnChildRemoveTransition( mImages ) );
-
-    ImageView imageView = mImages.back();
-    mAnimationContainer.Remove( imageView );
-    mImages.pop_back();
+    mAnimationContainer.Remove( mAnimationContainer.GetChildAt( mAnimationContainer.GetChildCount() - 1 ) );
   }
   return true;
 }
@@ -296,12 +367,12 @@ bool AnimationExample::OnSelectGridClicked( Button button )
   if ( !mGridSet )
   {
-    mGridLayout.SetTransitionData( LayoutTransitionData::ON_OWNER_SET, CreateOnSetLayoutTransition( mAnimationContainer, mImages ) );
+    mGridLayout.SetTransitionData( LayoutTransitionData::ON_OWNER_SET, CreateOnSetLayoutTransition( mAnimationContainer ) );
     DevelControl::SetLayout( mAnimationContainer, mGridLayout );
   }
   else
   {
-    mHorizontalLayout.SetTransitionData( LayoutTransitionData::ON_OWNER_SET, CreateOnSetLayoutTransition( mAnimationContainer, mImages ) );
+    mHorizontalLayout.SetTransitionData( LayoutTransitionData::ON_OWNER_SET, CreateOnSetLayoutTransition( mAnimationContainer ) );
     DevelControl::SetLayout( mAnimationContainer, mHorizontalLayout );
   }
@@ -311,9 +382,9 @@ bool AnimationExample::OnSelectGridClicked( Button button )
 bool AnimationExample::OnAddClicked( Button button )
 {
-  if (mImages.size() < 4)
+  if( mAnimationContainer.GetChildCount() < 4 )
   {
-    CreateChildImageViewAndAdd( mAnimationContainer, mImages.size(), mImages );
+    CreateChildAndAdd( *this, mAnimationContainer );
   }
   return true;
 }
@@ -61,7 +61,6 @@ private:
   PushButton mAddButton;
   PushButton mSelectGridButton;
   PushButton mShakeButton;
-  std::vector< Toolkit::ImageView > mImages;
   Control mAnimationContainer;
   Grid mGridLayout;
   LinearLayout mHorizontalLayout;
+/*
+ * Copyright (c) 2018 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-toolkit/dali-toolkit.h>
+#include "dali-toolkit/devel-api/controls/web-view/web-view.h"
+#include <dali/integration-api/debug.h>
+#include <unistd.h>
+
+using namespace Dali;
+
+namespace{
+
+}
+
+class WebViewController : public ConnectionTracker
+{
+public:
+
+  WebViewController( Application& application )
+  : mApplication( application )
+  , mUrlPointer( 0 )
+  {
+    // Connect to the Application's Init signal
+    mApplication.InitSignal().Connect( this, &WebViewController::Create );
+  }
+
+  ~WebViewController()
+  {
+    // Nothing to do here;
+  }
+
+  const char* GetNextUrl()
+  {
+    static const unsigned int kUrlSize = 3;
+    static const char* kUrls[kUrlSize] = {
+      "https://webkit.org/blog-files/3d-transforms/poster-circle.html",
+      "https://www.amazon.com",
+      "https://www.google.com"
+    };
+    mUrlPointer %= kUrlSize;
+    return kUrls[mUrlPointer++];
+  }
+
+  // The Init signal is received once (only) during the Application lifetime
+  void Create( Application& application )
+  {
+    // Get a handle to the stage
+    Stage stage = Stage::GetCurrent();
+    stage.SetBackgroundColor( Vector4(0.2, 0.6, 1, 1) );
+
+    float width = stage.GetSize().width;
+    float height = stage.GetSize().height;
+    float fontSize = width * 0.02f;
+
+    mWebView = Toolkit::WebView::New( "ko-KR", "Asia/Seoul" );
+    mWebView.SetParentOrigin( Dali::ParentOrigin::CENTER );
+    mWebView.SetAnchorPoint( Dali::AnchorPoint::CENTER );
+    mWebView.SetPosition( 0, 0 );
+    mWebView.SetSize( width, height );
+    mWebView.PageLoadStartedSignal().Connect( this, &WebViewController::OnPageLoadStarted );
+    mWebView.PageLoadFinishedSignal().Connect( this, &WebViewController::OnPageLoadFinished );
+
+    std::string url = GetNextUrl();
+    mWebView.LoadUrl( url );
+    stage.Add(mWebView);
+
+    mAddressLabel = Toolkit::TextLabel::New( url );
+    mAddressLabel.SetAnchorPoint( AnchorPoint::TOP_LEFT );
+    mAddressLabel.SetProperty( Toolkit::TextLabel::Property::POINT_SIZE, fontSize );
+    mAddressLabel.SetProperty( Toolkit::TextLabel::Property::TEXT_COLOR, Color::WHITE );
+    mAddressLabel.SetBackgroundColor( Vector4( 0, 0, 0, 0.5f ) );
+    mAddressLabel.TouchedSignal().Connect( this, &WebViewController::OnTouchText );
+    stage.Add( mAddressLabel );
+
+    // Respond to key events
+    stage.KeyEventSignal().Connect( this, &WebViewController::OnKeyEvent );
+    Toolkit::KeyboardFocusManager::Get().SetCurrentFocusActor( mWebView );
+  }
+
+  void OnPageLoadStarted( Toolkit::WebView view, const std::string& url )
+  {
+    mAddressLabel.SetProperty( Toolkit::TextLabel::Property::TEXT, "Loading" );
+  }
+
+  void OnPageLoadFinished( Toolkit::WebView view, const std::string& url )
+  {
+    mAddressLabel.SetProperty( Toolkit::TextLabel::Property::TEXT, url.c_str() );
+  }
+
+  bool OnTouchText( Actor actor, const TouchEvent& event )
+  {
+    if ( event.GetPoint( 0 ).state == TouchPoint::Up )
+    {
+      std::string url = GetNextUrl();
+      mAddressLabel.SetProperty(Toolkit::TextLabel::Property::TEXT, "Waiting" );
+      mWebView.LoadUrl( url );
+    }
+
+    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();
+      }
+    }
+  }
+
+private:
+  Application&  mApplication;
+  Toolkit::WebView mWebView;
+  Toolkit::TextLabel mAddressLabel;
+  unsigned int mUrlPointer;
+};
+
+int DALI_EXPORT_API main( int argc, char **argv )
+{
+  Application application = Application::New( &argc, &argv );
+  WebViewController test( application );
+  application.MainLoop();
+  return 0;
+}
@@ -2,7 +2,7 @@
 Name:       com.samsung.dali-demo
 Summary:    The OpenGLES Canvas Core Demo
-Version:    1.3.48
+Version:    1.3.49
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0
@@ -243,3 +243,6 @@ msgstr &quot;Skybox&quot;
 msgid "DALI_DEMO_STR_TITLE_PBR"
 msgstr "PBR"
+
+msgid "DALI_DEMO_STR_TITLE_WEB_VIEW"
+msgstr "Web View"
@@ -246,3 +246,6 @@ msgstr &quot;Skybox&quot;
 msgid "DALI_DEMO_STR_TITLE_PBR"
 msgstr "PBR"
+
+msgid "DALI_DEMO_STR_TITLE_WEB_VIEW"
+msgstr "Web View"
@@ -114,6 +114,7 @@ extern &quot;C&quot;
 #define DALI_DEMO_STR_TITLE_TILT_SENSOR                 dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_TILT_SENSOR")
 #define DALI_DEMO_STR_TITLE_TOOLTIP                     dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_TOOLTIP")
 #define DALI_DEMO_STR_TITLE_VISUAL_TRANSITIONS          dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_VISUAL_TRANSITIONS")
+#define DALI_DEMO_STR_TITLE_WEB_VIEW                    dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_WEB_VIEW")
 #else // !INTERNATIONALIZATION_ENABLED
@@ -199,6 +200,7 @@ extern &quot;C&quot;
 #define DALI_DEMO_STR_TITLE_TILT_SENSOR                 "Tilt Sensor"
 #define DALI_DEMO_STR_TITLE_TOOLTIP                     "Tooltip"
 #define DALI_DEMO_STR_TITLE_VISUAL_TRANSITIONS          "Visual Transitions"
+#define DALI_DEMO_STR_TITLE_WEB_VIEW                    "Web View"
 #endif
 #ifdef __cplusplus