Merge "Remove non-touch related deprecated APIs" into devel/master

Adeel Kazmi · Gerrit Code Review
2 parents f5531b6a 6bccceeb
Showing 37 changed files with 44 additions and 142 deletions
examples/animated-shapes/animated-shapes-example.cpp
examples/bezier-curve/bezier-curve-example.cpp
examples/blocks/blocks-example.cpp
examples/clipping/clipping-example.cpp
examples/contact-cards/contact-cards-example.cpp
examples/fpp-game/fpp-game-example.cpp
examples/frame-callback/frame-callback-example.cpp
examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp
examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp
examples/image-view-svg/image-view-svg-example.cpp
examples/line-mesh/line-mesh-example.cpp
examples/magnifier/magnifier-example.cpp
examples/mesh-morph/mesh-morph-example.cpp
examples/motion-blur/motion-blur-example.cpp
examples/motion-stretch/motion-stretch-example.cpp
examples/native-image-source/native-image-source-example.cpp
examples/page-turn-view/page-turn-view-example.cpp
examples/point-mesh/point-mesh-example.cpp
examples/pre-render-callback/pre-render-callback-example.cpp
examples/primitive-shapes/primitive-shapes-example.cpp
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -103,9 +103,6 @@ public:
   // The Init signal is received once (only) during the Application lifetime
   void Create( Application& application )
   {
-    // Hide the indicator bar
-    application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
-
     Stage stage = Stage::GetCurrent();
     // Creates the background gradient
 /*
- * Copyright (c) 2019 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -149,9 +149,6 @@ public:
   // The Init signal is received once (only) during the Application lifetime
   void Create( Application& application )
   {
-    // Hide the indicator bar
-    application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
-
     Stage stage = Stage::GetCurrent();
     stage.KeyEventSignal().Connect( this, &BezierCurveExample::OnKeyEvent );
 /*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -251,9 +251,6 @@ public:
   {
     Stage::GetCurrent().KeyEventSignal().Connect(this, &ExampleController::OnKeyEvent);
-    // Hide the indicator bar
-    application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
-
     // Creates a default view with a default tool bar.
     // The view is added to the stage.
     Toolkit::ToolBar toolBar;
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -74,9 +74,6 @@ private:
    */
   void Create( Application& application )
   {
-    // Hide the indicator bar
-    application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
-
     // Connect to the stage's key signal to allow Back and Escape to exit.
     Stage stage = Dali::Stage::GetCurrent();
     stage.KeyEventSignal().Connect( this, &ClippingExample::OnKeyEvent );
 /*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -79,9 +79,6 @@ private:
    */
   void Create( Application& application )
   {
-    // Hide the indicator bar
-    application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
-
     // Set the stage background color and connect to the stage's key signal to allow Back and Escape to exit.
     Stage stage = Stage::GetCurrent();
     stage.SetBackgroundColor( STAGE_COLOR );
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -93,10 +93,6 @@ public:
   // The Init signal is received once (only) during the Application lifetime
   void Create( Application& application )
   {
-    // Disable indicator
-    Dali::Window winHandle = application.GetWindow();
-    winHandle.ShowIndicator( Dali::Window::INVISIBLE );
-
     // Get a handle to the stage
     mStage = Stage::GetCurrent();
 /*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -77,9 +77,6 @@ private:
    */
   void Create( Application& /* application */ )
   {
-    // Hide the indicator bar.
-    mApplication.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
-
     // Set the stage background color and connect to the stage's key signal to allow Back and Escape to exit.
     mStage = Stage::GetCurrent();
     mStage.SetBackgroundColor( Color::WHITE );
@@ -177,9 +177,6 @@ public:
     // Get a handle to the stage
     Stage stage = Stage::GetCurrent();
-    // Hide the indicator bar
-    application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
-
     // Background image:
     Dali::Property::Map backgroundImage;
     backgroundImage.Insert( Toolkit::Visual::Property::TYPE,  Toolkit::Visual::IMAGE );
 /*
- * Copyright (c) 2019 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -303,9 +303,6 @@ public:
     // Connect to input event signals:
     stage.KeyEventSignal().Connect(this, &ImageScalingIrregularGridController::OnKeyEvent);
-    // Hide the indicator bar
-    mApplication.GetWindow().ShowIndicator(Dali::Window::INVISIBLE);
-
     // Create a default view with a default tool bar:
     mContentLayer = DemoHelper::CreateView( mApplication,
                                             mView,
 /*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -69,9 +69,6 @@ public:
     Vector2 stageSize = stage.GetSize();
     mActorSize = stageSize/2.f;
-    // Hide the indicator bar
-    application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
-
     stage.KeyEventSignal().Connect(this, &ImageSvgController::OnKeyEvent);
     // Background, for receiving gestures
@@ -167,9 +167,6 @@ public:
     Initialise();
-    // Hide the indicator bar
-    application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
-
     stage.SetBackgroundColor(Vector4(0.0f, 0.2f, 0.2f, 1.0f));
   }
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -200,9 +200,6 @@ public:
     // The Init signal is received once (only) during the Application lifetime
-    // Hide the indicator bar
-    application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
-
     // Creates a default view with a default tool bar.
     // The view is added to the stage.
     Toolkit::ToolBar toolBar;
@@ -288,9 +288,6 @@ public:
     // The Init signal is received once (only) during the Application lifetime
-    // Hide the indicator bar
-    application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
-
     mShader = Shader::New( VERTEX_SHADER, FRAGMENT_SHADER );
     mGeometry = CreateGeometry();
     mRenderer = Renderer::New( mGeometry, mShader );
 /*
- * Copyright (c) 2019 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -193,7 +193,7 @@ public:
     winHandle.AddAvailableOrientation( Dali::Window::LANDSCAPE );
     winHandle.AddAvailableOrientation( Dali::Window::PORTRAIT_INVERSE  );
     winHandle.AddAvailableOrientation( Dali::Window::LANDSCAPE_INVERSE );
-    winHandle.ResizedSignal().Connect( this, &MotionBlurExampleApp::OnWindowResized );
+    winHandle.ResizeSignal().Connect( this, &MotionBlurExampleApp::OnWindowResized );
     // set initial orientation
     Rotate( PORTRAIT );
@@ -231,7 +231,7 @@ public:
   //
   //
-  void OnWindowResized( Window::WindowSize size )
+  void OnWindowResized( Window window, Window::WindowSize size )
   {
     Rotate( size.GetWidth() > size.GetHeight() ? LANDSCAPE : PORTRAIT );
   }
@@ -173,7 +173,7 @@ public:
     winHandle.AddAvailableOrientation( Dali::Window::LANDSCAPE );
     winHandle.AddAvailableOrientation( Dali::Window::PORTRAIT_INVERSE  );
     winHandle.AddAvailableOrientation( Dali::Window::LANDSCAPE_INVERSE );
-    winHandle.ResizedSignal().Connect( this, &MotionStretchExampleApp::OnWindowResized );
+    winHandle.ResizeSignal().Connect( this, &MotionStretchExampleApp::OnWindowResized );
     // set initial orientation
     Rotate( PORTRAIT );
@@ -204,7 +204,7 @@ public:
   //
   //
-  void OnWindowResized( Window::WindowSize size )
+  void OnWindowResized( Window window, Window::WindowSize size )
   {
     Rotate( size.GetWidth() > size.GetHeight() ? LANDSCAPE : PORTRAIT );
   }
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -130,9 +130,6 @@ public:
     Stage stage = Stage::GetCurrent();
     stage.SetBackgroundColor( Color::WHITE );
-    // Hide the indicator bar
-    application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
-
     stage.KeyEventSignal().Connect(this, &NativeImageSourceController::OnKeyEvent);
     CreateButtonArea();
 /*
- * Copyright (c) 2019 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -169,7 +169,7 @@ public:
 private:
-  void OnWindowResized( Window::WindowSize size );
+  void OnWindowResized( Window window, Window::WindowSize size );
   void Rotate( DemoOrientation orientation );
@@ -210,13 +210,13 @@ void PageTurnExample::OnInit( Application&amp; app )
   window.AddAvailableOrientation( Window::LANDSCAPE );
   window.AddAvailableOrientation( Window::PORTRAIT_INVERSE  );
   window.AddAvailableOrientation( Window::LANDSCAPE_INVERSE );
-  window.ResizedSignal().Connect( this, &PageTurnExample::OnWindowResized );
+  window.ResizeSignal().Connect( this, &PageTurnExample::OnWindowResized );
   Window::WindowSize size = window.GetSize();
   Rotate( size.GetWidth() > size.GetHeight() ? LANDSCAPE : PORTRAIT );
 }
-void PageTurnExample::OnWindowResized( Window::WindowSize size )
+void PageTurnExample::OnWindowResized( Window window, Window::WindowSize size )
 {
   Rotate( size.GetWidth() > size.GetHeight() ? LANDSCAPE : PORTRAIT );
 }
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -149,9 +149,6 @@ public:
     // The Init signal is received once (only) during the Application lifetime
-    // Hide the indicator bar
-    application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
-
     Texture texture0 = DemoHelper::LoadTexture( MATERIAL_SAMPLE );
     Texture texture1 = DemoHelper::LoadTexture( MATERIAL_SAMPLE2 );
 /*
- * Copyright (c) 2019 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -93,9 +93,6 @@ private:
     mStage.SetBackgroundColor( Color::WHITE );
     mStage.KeyEventSignal().Connect( this, &PreRenderCallbackController::OnKeyEvent );
-    // Hide the indicator bar.
-    mApplication.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
-
     // Detect taps on the root layer.
     mTapDetector = TapGestureDetector::New();
     mTapDetector.Attach( mStage.GetRootLayer() );
 /*
- * Copyright (c) 2019 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -87,9 +87,6 @@ public:
     Stage stage = Stage::GetCurrent();
     stage.SetBackgroundColor( Color::WHITE );
-    // Hide the indicator bar
-    application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
-
     //Set up layer to place UI on.
     Layer layer = Layer::New();
     layer.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -122,9 +122,6 @@ public:
     stage.SetBackgroundColor( Color::YELLOW );
-    // Hide the indicator bar
-    application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
-
     // Creates a default view with a default tool bar.
     // The view is added to the stage.
     mContentLayer = DemoHelper::CreateView( application,
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -115,9 +115,6 @@ private:
   {
     Stage stage = Stage::GetCurrent();
-    // Hide the indicator bar
-    application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
-
     // Use a gradient visual to render the background gradient.
     Toolkit::Control background = Dali::Toolkit::Control::New();
     background.SetProperty( Actor::Property::ANCHOR_POINT, Dali::AnchorPoint::CENTER );
 /*
- * Copyright (c) 2019 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -104,10 +104,6 @@ public:
   // The Init signal is received once (only) during the Application lifetime
   void Create( Application& application )
   {
-    // Disable indicator
-    Dali::Window winHandle = application.GetWindow();
-    winHandle.ShowIndicator( Dali::Window::INVISIBLE );
-
     // Get a handle to the stage
     Stage stage = Stage::GetCurrent();
     stage.SetBackgroundColor( Color::BLACK );
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -147,11 +147,6 @@ public:
   // The Init signal is received once (only) during the Application lifetime
   void Create( Application& application )
   {
-    // Disable indicator.
-    // It avoids reposition the camera to fit with the indicator height.
-    Dali::Window winHandle = application.GetWindow();
-    winHandle.ShowIndicator( Dali::Window::INVISIBLE );
-
     // Get a handle to the stage
     Stage stage = Stage::GetCurrent();
     stage.SetBackgroundColor( Color::WHITE );
 /*
- * Copyright (c) 2019 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -167,9 +167,6 @@ public:
     Stage stage = Dali::Stage::GetCurrent();
     stage.KeyEventSignal().Connect(this, &ExampleController::OnKeyEvent);
-    // Hide the indicator bar
-    mApplication.GetWindow().ShowIndicator(Dali::Window::INVISIBLE);
-
     // Creates a default view with a default tool bar.
     // The view is added to the stage.
     mContentLayer = DemoHelper::CreateView( app,
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -107,9 +107,6 @@ void SimpleVisualsApplication::Create( Application&amp; application )
   // Connect to key events so can quit application
   stage.KeyEventSignal().Connect(this, &SimpleVisualsApplication::OnKeyEvent);
-  // Hide the indicator bar
-  application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
-
   // Create a table view to parent the 2 MyControls
   TableView contentLayout = TableView::New( 2, 2 );
   contentLayout.SetProperty( Dali::Actor::Property::NAME,"ContentLayout");
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -109,9 +109,6 @@ void StylingApplication::Create( Application&amp; application )
   stage.KeyEventSignal().Connect(this, &StylingApplication::OnKeyEvent);
   stage.SetBackgroundColor( Vector4( 0.1f, 0.1f, 0.1f, 1.0f ) );
-  // Hide the indicator bar
-  application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
-
   mContentPane = CreateContentPane();
   stage.Add( mContentPane );
   mContentPane.SetProperty( Actor::Property::SIZE, stage.GetSize() );
 /*
- * Copyright (c) 2019 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -72,9 +72,6 @@ public:
     stage.SetBackgroundColor( Vector4( 0.04f, 0.345f, 0.392f, 1.0f ) );
     stage.KeyEventSignal().Connect(this, &TextFieldExample::OnKeyEvent);
-    // Hide the indicator bar
-    application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
-
     mButton = CreateFolderButton();
     mButton.ClickedSignal().Connect( this, &TextFieldExample::OnButtonClicked );
     stage.Add( mButton );
 /*
- * Copyright (c) 2019 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -633,7 +633,7 @@ public:
           case KEY_ZERO: // fall through
           case KEY_ONE:
           {
-            mLabel.SetProperty( TextLabel::Property::RENDERING_BACKEND, event.keyCode - 10 );
+            mLabel.SetProperty( DevelTextLabel::Property::RENDERING_BACKEND, event.keyCode - 10 );
             break;
           }
           case KEY_A: // Animate text colour
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -109,9 +109,6 @@ public:
     mStageSize = stage.GetSize();
-    // Hide the indicator bar
-    application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
-
     Texture texture1 = DemoHelper::LoadTexture( MATERIAL_SAMPLE );
     Texture texture2 = DemoHelper::LoadTexture( MATERIAL_SAMPLE2 );
 /*
- * Copyright (c) 2019 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -52,9 +52,6 @@ private:
   // The Init signal is received once (only) during the Application lifetime
   void Create( Application& application )
   {
-    // Hide the indicator bar
-    application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
-
     // Set the stage background color and connect to the stage's key signal to allow Back and Escape to exit.
     Stage stage = Stage::GetCurrent();
     stage.SetBackgroundColor( STAGE_COLOR );
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -73,9 +73,6 @@ void TransitionApplication::Create( Application&amp; application )
   stage.KeyEventSignal().Connect(this, &TransitionApplication::OnKeyEvent);
   stage.SetBackgroundColor( Vector4( 0.1f, 0.1f, 0.1f, 1.0f ) );
-  // Hide the indicator bar
-  application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
-
   // Content panes:
   TableView contentLayout = TableView::New( 3, 1 );
   contentLayout.SetProperty( Dali::Actor::Property::NAME,"ContentLayout");
 /*
- * Copyright (c) 2019 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -59,8 +59,6 @@ class VideoViewController: public ConnectionTracker
   void Create( Application& application )
   {
-    application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
-
     mStageSize = Stage::GetCurrent().GetSize();
     mVideoView = Toolkit::VideoView::New();
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -73,9 +73,6 @@ void TransitionApplication::Create( Application&amp; application )
   stage.KeyEventSignal().Connect(this, &TransitionApplication::OnKeyEvent);
   stage.SetBackgroundColor( Vector4( 0.1f, 0.1f, 0.1f, 1.0f ) );
-  // Hide the indicator bar
-  application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
-
   // Content panes:
   TableView contentLayout = TableView::New( 4, 1 );
   contentLayout.SetProperty( Dali::Actor::Property::NAME,"ContentLayout");
 /*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -82,7 +82,7 @@ public:
     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 );
+    mAddressLabel.TouchSignal().Connect( this, &WebViewController::OnTouchText );
     stage.Add( mAddressLabel );
     // Respond to key events
@@ -100,9 +100,9 @@ public:
     mAddressLabel.SetProperty( Toolkit::TextLabel::Property::TEXT, url.c_str() );
   }
-  bool OnTouchText( Actor actor, const TouchEvent& event )
+  bool OnTouchText( Actor actor, const TouchData& touch )
   {
-    if ( event.GetPoint( 0 ).state == TouchPoint::Up )
+    if ( touch.GetState( 0 ) == PointState::UP )
     {
       std::string url = GetNextUrl();
       mAddressLabel.SetProperty(Toolkit::TextLabel::Property::TEXT, "Waiting" );
 /*
- * Copyright (c) 2019 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -309,8 +309,6 @@ void DaliTableView::Initialize( Application&amp; application )
   unsigned int degrees = 0;
   Rotate( degrees );
-  winHandle.ShowIndicator( Dali::Window::INVISIBLE );
-
   // Background animation
   mAnimationTimer = Timer::New( BACKGROUND_ANIMATION_DURATION );
   mAnimationTimer.TickSignal().Connect( this, &DaliTableView::PauseBackgroundAnimation );
@@ -2,7 +2,7 @@
 #define DALI_DEMO_HELPER_VIEW_H
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -117,9 +117,6 @@ Dali::Layer CreateView( Dali::Application&amp; application,
 {
   Dali::Stage stage = Dali::Stage::GetCurrent();
-  // Hide the indicator bar
-  application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
-
   // Create default View.
   view = Dali::Toolkit::Control::New();
   view.SetProperty( Dali::Actor::Property::ANCHOR_POINT, Dali::AnchorPoint::CENTER );