Remove SystemOverlay.

Change-Id: If4f5ce327ef17bc04b9dcc3fff2d966a1a2b5470

diff --git a/dali/internal/window-system/common/window-impl.cpp b/dali/internal/window-system/common/window-impl.cpp
index 2ea6269..2d8cc15 100644 (file)
--- a/dali/internal/window-system/common/window-impl.cpp
+++ b/dali/internal/window-system/common/window-impl.cpp
@@ -20,7 +20,6 @@
 
 // EXTERNAL HEADERS
 #include <dali/integration-api/core.h>
-#include <dali/integration-api/system-overlay.h>
 #include <dali/integration-api/render-task-list-integ.h>
 #include <dali/public-api/actors/camera-actor.h>
 #include <dali/public-api/render-tasks/render-task.h>
@@ -77,7 +76,6 @@ Window::Window()
   mIndicatorOrientation( Dali::Window::PORTRAIT ),
   mNextIndicatorOrientation( Dali::Window::PORTRAIT ),
   mIndicatorOpacityMode( Dali::Window::OPAQUE ),
-  mOverlay( NULL ),
   mAdaptor( NULL ),
   mType( Dali::Window::NORMAL ),
   mPreferredOrientation( Dali::Window::PORTRAIT ),
@@ -92,10 +90,6 @@ Window::~Window()
 {
   if( mIndicator )
   {
-    mOverlay->Remove( mIndicator->GetActor() );
-    Dali::RenderTaskList taskList = mOverlay->GetOverlayRenderTasks();
-    Dali::RenderTask indicatorTask = taskList.GetTask(0);
-    mOverlay->GetOverlayRenderTasks().RemoveTask(indicatorTask);
     mIndicator->Close();
   }
 
@@ -148,21 +142,6 @@ void Window::SetAdaptor(Dali::Adaptor& adaptor)
 
   // Create one overlay for the main window only
   Internal::Adaptor::Adaptor& adaptorImpl = Internal::Adaptor::Adaptor::GetImplementation(adaptor);
-  Integration::Core& core = adaptorImpl.GetCore();
-  mOverlay = &core.GetSystemOverlay();
-
-  // Only create render task list for the overlay once
-  if (!mOverlay->GetOverlayRenderTasks())
-  {
-    Dali::RenderTaskList overlayRenderTaskList = Integration::RenderTaskList::New();
-
-    Dali::Actor overlayRootActor = mOverlay->GetDefaultRootActor();
-    Dali::CameraActor overlayCameraActor = mOverlay->GetDefaultCameraActor();
-    Integration::RenderTaskList::CreateTask( overlayRenderTaskList, overlayRootActor, overlayCameraActor );
-
-    mOverlay->SetOverlayRenderTasks( overlayRenderTaskList );
-  }
-
   mAdaptor = &adaptorImpl;
   mAdaptor->AddObserver( *this );
 
@@ -611,7 +590,6 @@ void Window::DoShowIndicator( Dali::Window::WindowOrientation lastOrientation )
         mIndicator->SetOpacityMode( mIndicatorOpacityMode );
         Dali::Actor actor = mIndicator->GetActor();
         SetIndicatorActorRotation();
-        mOverlay->Add(actor);
       }
     }
     // else don't create a hidden indicator

diff --git a/dali/internal/window-system/common/window-impl.h b/dali/internal/window-system/common/window-impl.h
index fff44b7..77979c0 100644 (file)
--- a/dali/internal/window-system/common/window-impl.h
+++ b/dali/internal/window-system/common/window-impl.h
@@ -34,11 +34,6 @@ namespace Dali
 {
 class Adaptor;
 
-namespace Integration
-{
-class SystemOverlay;
-}
-
 namespace Internal
 {
 namespace Adaptor
@@ -483,7 +478,6 @@ private:
   Dali::Window::WindowOrientation       mIndicatorOrientation;
   Dali::Window::WindowOrientation       mNextIndicatorOrientation;
   Dali::Window::IndicatorBgOpacity      mIndicatorOpacityMode;
-  Integration::SystemOverlay*           mOverlay;
   Adaptor*                              mAdaptor;
   Dali::DragAndDropDetector             mDragAndDropDetector;
   Dali::Window::Type                    mType;