Merge "DALi Version 2.3.2" into devel/master
[platform/core/uifw/dali-adaptor.git] / dali / internal / adaptor / common / application-impl.cpp
index d626def..44d4146 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 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.
 #include <dali/internal/adaptor/common/application-impl.h>
 
 // EXTERNAL INCLUDES
-#include <dali/public-api/object/object-registry.h>
-#include <dali/integration-api/debug.h>
 #include <dali/devel-api/common/singleton-service.h>
+#include <dali/integration-api/debug.h>
+#include <dali/integration-api/trace.h>
+#include <dali/public-api/object/object-registry.h>
 
 // INTERNAL INCLUDES
+#include <dali/devel-api/adaptor-framework/accessibility-bridge.h>
+#include <dali/devel-api/adaptor-framework/environment-variable.h>
 #include <dali/devel-api/adaptor-framework/style-monitor.h>
+#include <dali/devel-api/atspi-interfaces/accessible.h>
 #include <dali/devel-api/text-abstraction/font-client.h>
 #include <dali/internal/adaptor/common/adaptor-impl.h>
-#include <dali/internal/system/common/command-line-options.h>
+#include <dali/internal/adaptor/common/framework-factory.h>
 #include <dali/internal/adaptor/common/framework.h>
 #include <dali/internal/adaptor/common/lifecycle-controller-impl.h>
+#include <dali/internal/system/common/command-line-options.h>
+#include <dali/internal/system/common/environment-variables.h>
+#include <dali/internal/system/common/system-settings.h>
+#include <dali/internal/window-system/common/render-surface-factory.h>
 #include <dali/internal/window-system/common/window-impl.h>
 #include <dali/internal/window-system/common/window-render-surface.h>
-#include <dali/internal/window-system/common/render-surface-factory.h>
+#include <dali/internal/window-system/common/window-system.h>
 
 // To disable a macro with the same name from one of OpenGL headers
 #undef Status
 
 namespace Dali
 {
-
 namespace TizenPlatform
 {
 class TizenPlatformAbstraction;
@@ -52,38 +59,65 @@ class Core;
 
 namespace Internal
 {
-
 namespace Adaptor
 {
+DALI_INIT_TRACE_FILTER(gTraceFilter, DALI_TRACE_APPLICATION, true);
 
-ApplicationPtr Application::gPreInitializedApplication( NULL );
+ApplicationPtr Application::gPreInitializedApplication(NULL);
 
 ApplicationPtr Application::New(
-  int* argc,
-  char **argv[],
+  int*               argc,
+  char**             argv[],
   const std::string& stylesheet,
-  Dali::Application::WINDOW_MODE windowMode,
-  const PositionSize& positionSize,
-  Framework::Type applicationType)
+  Framework::Type    applicationType,
+  bool               useUiThread,
+  const WindowData&  windowData)
 {
-  ApplicationPtr application ( new Application (argc, argv, stylesheet, windowMode, positionSize, applicationType ) );
+  ApplicationPtr application(new Application(argc, argv, stylesheet, applicationType, useUiThread, windowData));
   return application;
 }
 
-void Application::PreInitialize( int* argc, char** argv[] )
+void Application::PreInitialize(int* argc, char** argv[])
 {
-  if( !gPreInitializedApplication )
+  if(!gPreInitializedApplication)
   {
-    Dali::TextAbstraction::FontClientPreInitialize();
+    bool isUseUIThread = false;
+
+#ifdef UI_THREAD_AVAILABLE
+    char* retEnv = std::getenv("TIZEN_UI_THREAD");
+    if(retEnv)
+    {
+      std::string uiThreadEnv   = retEnv;
+      std::string enabledString = "true";
+      if(uiThreadEnv == enabledString)
+      {
+        isUseUIThread = true;
+      }
+    }
+#endif
 
-    gPreInitializedApplication = new Application ( argc, argv, "", Dali::Application::OPAQUE, PositionSize(), Framework::NORMAL );
-    gPreInitializedApplication->CreateWindow();    // Only create window
+    Dali::TextAbstraction::FontClientPreInitialize();
+    WindowData windowData;
+    gPreInitializedApplication                  = new Application(argc, argv, "", Framework::NORMAL, isUseUIThread, windowData);
     gPreInitializedApplication->mLaunchpadState = Launchpad::PRE_INITIALIZED;
+
+#ifdef UI_THREAD_AVAILABLE
+    if(isUseUIThread)
+    {
+      DALI_LOG_RELEASE_INFO("PRE_INITIALIZED with UI Threading");
+      gPreInitializedApplication->mUIThreadLoader = new UIThreadLoader(argc, argv);
+      gPreInitializedApplication->mUIThreadLoader->Run([&]() { gPreInitializedApplication->CreateWindow(); });
+    }
+    else
+#endif
+    {
+      DALI_LOG_RELEASE_INFO("Only PRE_INITIALIZED");
+      gPreInitializedApplication->CreateWindow(); // Only create window
+    }
   }
 }
 
-Application::Application( int* argc, char** argv[], const std::string& stylesheet,
-  Dali::Application::WINDOW_MODE windowMode, const PositionSize& positionSize, Framework::Type applicationType )
+Application::Application(int* argc, char** argv[], const std::string& stylesheet, Framework::Type applicationType, bool useUiThread, const WindowData& windowData)
 : mInitSignal(),
   mTerminateSignal(),
   mPauseSignal(),
@@ -92,31 +126,42 @@ Application::Application( int* argc, char** argv[], const std::string& styleshee
   mAppControlSignal(),
   mLanguageChangedSignal(),
   mRegionChangedSignal(),
-  mEventLoop( nullptr ),
-  mFramework( nullptr ),
-  mContextLossConfiguration( Configuration::APPLICATION_DOES_NOT_HANDLE_CONTEXT_LOSS ),
-  mCommandLineOptions( nullptr ),
-  mAdaptorBuilder( nullptr ),
-  mAdaptor( nullptr ),
+  mFramework(nullptr),
+  mFrameworkFactory(nullptr),
+  mCommandLineOptions(nullptr),
+  mAdaptorBuilder(nullptr),
+  mAdaptor(nullptr),
+  mEnvironmentOptions(nullptr),
   mMainWindow(),
-  mMainWindowMode( windowMode ),
+  mMainWindowMode(windowData.GetTransparency() ? WINDOW_MODE::TRANSPARENT : WINDOW_MODE::OPAQUE),
   mMainWindowName(),
-  mStylesheet( stylesheet ),
-  mEnvironmentOptions(),
-  mWindowPositionSize( positionSize ),
-  mLaunchpadState( Launchpad::NONE ),
-  mSlotDelegate( this )
-{
-  // Get mName from environment options
-  mMainWindowName = mEnvironmentOptions.GetWindowName();
-  if( mMainWindowName.empty() && argc && ( *argc > 0 ) )
+  mIsMainWindowFrontBufferRendering(windowData.GetFrontBufferRendering()),
+  mStylesheet(stylesheet),
+  mWindowPositionSize(windowData.GetPositionSize()),
+  mLaunchpadState(Launchpad::NONE),
+  mDefaultWindowType(windowData.GetWindowType()),
+  mUseUiThread(useUiThread),
+  mIsSystemInitialized(false),
+  mSlotDelegate(this),
+  mUIThreadLoader(nullptr)
+{
+  // Set mName from command-line args
+  if(argc && (*argc > 0))
   {
-    // Set mName from command-line args if environment option not set
     mMainWindowName = (*argv)[0];
   }
 
+  const char* uiThreadEnabled = Dali::EnvironmentVariable::GetEnvironmentVariable(DALI_ENV_ENABLE_UI_THREAD);
+  if(uiThreadEnabled && std::atoi(uiThreadEnabled) != 0)
+  {
+    mUseUiThread = true;
+  }
+
   mCommandLineOptions = new CommandLineOptions(argc, argv);
-  mFramework = new Framework( *this, argc, argv, applicationType );
+
+  mFrameworkFactory = std::unique_ptr<FrameworkFactory>(Dali::Internal::Adaptor::CreateFrameworkFactory());
+  mFramework        = mFrameworkFactory->CreateFramework(FrameworkBackend::DEFAULT, *this, *this, argc, argv, applicationType, mUseUiThread);
+
   mUseRemoteSurface = (applicationType == Framework::WATCH);
 }
 
@@ -124,67 +169,169 @@ Application::~Application()
 {
   SingletonService service = SingletonService::Get();
   // Note this can be false i.e. if Application has never created a Core instance
-  if( service )
+  if(service)
   {
     service.UnregisterAll();
   }
 
   mMainWindow.Reset();
-  delete mAdaptor;
-  delete mAdaptorBuilder;
+
   delete mCommandLineOptions;
-  delete mFramework;
+
+  // Application is created in Main thread whether UI Threading is enabled or not.
+  // But some resources are created in Main thread or UI thread.
+  // The below code is for the resource are created in Main thread.
+  if(!mUseUiThread)
+  {
+    delete mAdaptor;
+    delete mAdaptorBuilder;
+    if(mIsSystemInitialized)
+    {
+      WindowSystem::Shutdown();
+    }
+  }
+  else
+  {
+    if(mUIThreadLoader)
+    {
+      delete mUIThreadLoader;
+    }
+  }
+}
+
+void Application::StoreWindowPositionSize(PositionSize positionSize)
+{
+  mWindowPositionSize = positionSize;
+}
+
+void Application::StoreFrontBufferRendering(bool enable)
+{
+  mIsMainWindowFrontBufferRendering = enable;
+}
+
+void Application::ChangePreInitializedWindowInfo()
+{
+  // Set window name
+  auto windowClassName = mEnvironmentOptions->GetWindowClassName();
+  auto windowName      = mEnvironmentOptions->GetWindowName();
+  if(!windowName.empty())
+  {
+    mMainWindowName = windowName;
+  }
+  mMainWindow.SetClass(mMainWindowName, windowClassName);
+
+  // The real screen size may be different from the value of the preinitialized state. Update it.
+  Dali::Internal::Adaptor::WindowSystem::UpdateScreenSize();
+
+  int screenWidth, screenHeight;
+  Dali::Internal::Adaptor::WindowSystem::GetScreenSize(screenWidth, screenHeight);
+
+  // Set window position / size
+  if(mWindowPositionSize != PositionSize(0, 0, 0, 0))
+  {
+    Dali::DevelWindow::SetPositionSize(mMainWindow, mWindowPositionSize);
+  }
+  else if(mCommandLineOptions->stageWidth > 0 && mCommandLineOptions->stageHeight > 0)
+  {
+    // Command line options override environment options and full screen
+    mWindowPositionSize.width  = mCommandLineOptions->stageWidth;
+    mWindowPositionSize.height = mCommandLineOptions->stageHeight;
+    mMainWindow.SetSize(Dali::Window::WindowSize(mWindowPositionSize.width, mWindowPositionSize.height));
+  }
+  else if(mEnvironmentOptions->GetWindowWidth() && mEnvironmentOptions->GetWindowHeight())
+  {
+    // Environment options override full screen functionality if command line arguments not provided
+    mWindowPositionSize.width  = mEnvironmentOptions->GetWindowWidth();
+    mWindowPositionSize.height = mEnvironmentOptions->GetWindowHeight();
+    mMainWindow.SetSize(Dali::Window::WindowSize(mWindowPositionSize.width, mWindowPositionSize.height));
+  }
+  else if(screenWidth != mWindowPositionSize.width || screenHeight != mWindowPositionSize.height)
+  {
+    // Some apps can receive screen size differently after launching by specifying size in manifest.
+    mWindowPositionSize.width  = screenWidth;
+    mWindowPositionSize.height = screenHeight;
+    mMainWindow.SetSize(Dali::Window::WindowSize(mWindowPositionSize.width, mWindowPositionSize.height));
+  }
+
+  // Set front buffer rendering
+  Dali::DevelWindow::SetFrontBufferRendering(mMainWindow, mIsMainWindowFrontBufferRendering);
 }
 
 void Application::CreateWindow()
 {
-  if( mWindowPositionSize.width == 0 && mWindowPositionSize.height == 0 )
+  Internal::Adaptor::Window* window;
+  WindowData                 windowData;
+  windowData.SetTransparency(mMainWindowMode);
+  windowData.SetWindowType(mDefaultWindowType);
+  windowData.SetFrontBufferRendering(mIsMainWindowFrontBufferRendering);
+
+  DALI_LOG_RELEASE_INFO("Create Default Window");
+
+  WindowSystem::Initialize();
+  mIsSystemInitialized = true;
+
+  if(mLaunchpadState != Launchpad::PRE_INITIALIZED)
   {
-    if( mCommandLineOptions->stageWidth > 0 && mCommandLineOptions->stageHeight > 0 )
+    if(mWindowPositionSize.width == 0 && mWindowPositionSize.height == 0)
     {
-      // Command line options override environment options and full screen
-      mWindowPositionSize.width = mCommandLineOptions->stageWidth;
-      mWindowPositionSize.height = mCommandLineOptions->stageHeight;
+      if(mCommandLineOptions->stageWidth > 0 && mCommandLineOptions->stageHeight > 0)
+      {
+        // Command line options override environment options and full screen
+        mWindowPositionSize.width  = mCommandLineOptions->stageWidth;
+        mWindowPositionSize.height = mCommandLineOptions->stageHeight;
+      }
+      else if(mEnvironmentOptions->GetWindowWidth() && mEnvironmentOptions->GetWindowHeight())
+      {
+        // Environment options override full screen functionality if command line arguments not provided
+        mWindowPositionSize.width  = mEnvironmentOptions->GetWindowWidth();
+        mWindowPositionSize.height = mEnvironmentOptions->GetWindowHeight();
+      }
     }
-    else if( mEnvironmentOptions.GetWindowWidth() && mEnvironmentOptions.GetWindowHeight() )
+
+    auto windowClassName = mEnvironmentOptions->GetWindowClassName();
+    auto windowName      = mEnvironmentOptions->GetWindowName();
+    if(!windowName.empty())
     {
-      // Environment options override full screen functionality if command line arguments not provided
-      mWindowPositionSize.width = mEnvironmentOptions.GetWindowWidth();
-      mWindowPositionSize.height = mEnvironmentOptions.GetWindowHeight();
+      mMainWindowName = windowName;
     }
-  }
 
-  const std::string& windowClassName = mEnvironmentOptions.GetWindowClassName();
+    windowData.SetPositionSize(mWindowPositionSize);
+    window = Internal::Adaptor::Window::New(mMainWindowName, windowClassName, windowData);
+  }
+  else
+  {
+    // The position, size, window name, and frontbuffering of the pre-initialized application
+    // will be updated in ChangePreInitializedWindowInfo() when the real application is launched.
+    windowData.SetPositionSize(mWindowPositionSize);
+    window = Internal::Adaptor::Window::New("", "", windowData);
+  }
 
-  Internal::Adaptor::Window* window = Internal::Adaptor::Window::New(mWindowPositionSize, mMainWindowName, windowClassName, mMainWindowMode == Dali::Application::TRANSPARENT);
-  mMainWindow = Dali::Window( window );
+  mMainWindow = Dali::Window(window);
 
   // Quit the application when the window is closed
-  GetImplementation( mMainWindow ).DeleteRequestSignal().Connect( mSlotDelegate, &Application::Quit );
+  GetImplementation(mMainWindow).DeleteRequestSignal().Connect(mSlotDelegate, &Application::Quit);
 }
 
 void Application::CreateAdaptor()
 {
-  DALI_ASSERT_ALWAYS( mMainWindow && "Window required to create adaptor" );
+  DALI_ASSERT_ALWAYS(mMainWindow && "Window required to create adaptor");
 
   auto graphicsFactory = mAdaptorBuilder->GetGraphicsFactory();
 
-  Integration::SceneHolder sceneHolder = Integration::SceneHolder( &Dali::GetImplementation( mMainWindow ) );
+  Integration::SceneHolder sceneHolder = Integration::SceneHolder(&Dali::GetImplementation(mMainWindow));
 
-  mAdaptor = Adaptor::New( graphicsFactory, sceneHolder, mContextLossConfiguration, &mEnvironmentOptions );
+  mAdaptor = Adaptor::New(graphicsFactory, sceneHolder, mEnvironmentOptions.get());
 
-  Adaptor::GetImplementation( *mAdaptor ).SetUseRemoteSurface( mUseRemoteSurface );
+  Adaptor::GetImplementation(*mAdaptor).SetUseRemoteSurface(mUseRemoteSurface);
 }
 
 void Application::CreateAdaptorBuilder()
 {
-  mAdaptorBuilder = new AdaptorBuilder();
+  mAdaptorBuilder = new AdaptorBuilder(*mEnvironmentOptions);
 }
 
-void Application::MainLoop(Dali::Configuration::ContextLoss configuration)
+void Application::MainLoop()
 {
-  mContextLossConfiguration = configuration;
-
   // Run the application
   mFramework->Run();
 }
@@ -199,11 +346,13 @@ void Application::Quit()
 {
   // Actually quit the application.
   // Force a call to Quit even if adaptor is not running.
-  Internal::Adaptor::Adaptor::GetImplementation(*mAdaptor).AddIdle( MakeCallback( this, &Application::QuitFromMainLoop ), false, true );
+  Internal::Adaptor::Adaptor::GetImplementation(*mAdaptor).AddIdle(MakeCallback(this, &Application::QuitFromMainLoop), false);
 }
 
 void Application::QuitFromMainLoop()
 {
+  Accessibility::Bridge::GetCurrentBridge()->Terminate();
+
   mAdaptor->Stop();
 
   mFramework->Quit();
@@ -212,39 +361,56 @@ void Application::QuitFromMainLoop()
 
 void Application::OnInit()
 {
-  mFramework->AddAbortCallback( MakeCallback( this, &Application::QuitFromMainLoop ) );
+  mEnvironmentOptions = std::unique_ptr<EnvironmentOptions>(new EnvironmentOptions());
+
+  mFramework->AddAbortCallback(MakeCallback(this, &Application::QuitFromMainLoop));
 
   CreateAdaptorBuilder();
   // If an application was pre-initialized, a window was made in advance
-  if( mLaunchpadState == Launchpad::NONE )
+  if(mLaunchpadState == Launchpad::NONE)
   {
+    DALI_LOG_RELEASE_INFO("default Window is created in standalone");
     CreateWindow();
   }
 
   CreateAdaptor();
 
+  if(mLaunchpadState == Launchpad::PRE_INITIALIZED)
+  {
+    ChangePreInitializedWindowInfo();
+  }
+
   // Run the adaptor
+  DALI_TRACE_BEGIN(gTraceFilter, "DALI_APP_ADAPTOR_START");
   mAdaptor->Start();
+  DALI_TRACE_END(gTraceFilter, "DALI_APP_ADAPTOR_START");
+  Accessibility::Accessible::SetObjectRegistry(mAdaptor->GetObjectRegistry());
 
-  if( ! mStylesheet.empty() )
+  if(!mStylesheet.empty())
   {
-    Dali::StyleMonitor::Get().SetTheme( mStylesheet );
+    Dali::StyleMonitor::Get().SetTheme(mStylesheet);
   }
 
   // Wire up the LifecycleController
   Dali::LifecycleController lifecycleController = Dali::LifecycleController::Get();
 
-  InitSignal().Connect( &GetImplementation( lifecycleController ), &LifecycleController::OnInit );
-  TerminateSignal().Connect( &GetImplementation( lifecycleController ), &LifecycleController::OnTerminate );
-  PauseSignal().Connect( &GetImplementation( lifecycleController ), &LifecycleController::OnPause );
-  ResumeSignal().Connect( &GetImplementation( lifecycleController ), &LifecycleController::OnResume );
-  ResetSignal().Connect( &GetImplementation( lifecycleController ), &LifecycleController::OnReset );
-  LanguageChangedSignal().Connect( &GetImplementation( lifecycleController ), &LifecycleController::OnLanguageChanged );
+  InitSignal().Connect(&GetImplementation(lifecycleController), &LifecycleController::OnInit);
+  TerminateSignal().Connect(&GetImplementation(lifecycleController), &LifecycleController::OnTerminate);
+  PauseSignal().Connect(&GetImplementation(lifecycleController), &LifecycleController::OnPause);
+  ResumeSignal().Connect(&GetImplementation(lifecycleController), &LifecycleController::OnResume);
+  ResetSignal().Connect(&GetImplementation(lifecycleController), &LifecycleController::OnReset);
+  LanguageChangedSignal().Connect(&GetImplementation(lifecycleController), &LifecycleController::OnLanguageChanged);
 
   Dali::Application application(this);
-  mInitSignal.Emit( application );
+
+  DALI_TRACE_BEGIN(gTraceFilter, "DALI_APP_EMIT_INIT_SIGNAL");
+  mInitSignal.Emit(application);
+  DALI_TRACE_END(gTraceFilter, "DALI_APP_EMIT_INIT_SIGNAL");
 
   mAdaptor->NotifySceneCreated();
+
+  // Ensure the join of Font thread at this point
+  Dali::TextAbstraction::FontClientJoinFontThreads();
 }
 
 void Application::OnTerminate()
@@ -253,15 +419,24 @@ void Application::OnTerminate()
   // delete the window as ecore_x has been destroyed by AppCore
 
   Dali::Application application(this);
-  mTerminateSignal.Emit( application );
+  mTerminateSignal.Emit(application);
 
-  if( mAdaptor )
+  if(mAdaptor)
   {
     // Ensure that the render-thread is not using the surface(window) after we delete it
     mAdaptor->Stop();
   }
 
   mMainWindow.Reset(); // This only resets (clears) the default Window
+
+  // If DALi's UI Thread works, some resources are created in UI Thread, not Main thread.
+  // For that case, these resource should be deleted in UI Thread.
+  if(mUseUiThread)
+  {
+    delete mAdaptor;
+    delete mAdaptorBuilder;
+    WindowSystem::Shutdown();
+  }
 }
 
 void Application::OnPause()
@@ -270,7 +445,7 @@ void Application::OnPause()
   // DALi just delivers the framework Pause event to the application, but not actually pause DALi core.
   // Pausing DALi core only occurs on the Window Hidden framework event
   Dali::Application application(this);
-  mPauseSignal.Emit( application );
+  mPauseSignal.Emit(application);
 }
 
 void Application::OnResume()
@@ -278,13 +453,13 @@ void Application::OnResume()
   // Emit the signal first so the application can queue any messages before we do an update/render
   // This ensures we do not just redraw the last frame before pausing if that's not required
   Dali::Application application(this);
-  mResumeSignal.Emit( application );
+  mResumeSignal.Emit(application);
 
   // DALi just delivers the framework Resume event to the application.
   // Resuming DALi core only occurs on the Window Show framework event
 
   // Trigger processing of events queued up while paused
-  CoreEventInterface& coreEventInterface = Internal::Adaptor::Adaptor::GetImplementation( GetAdaptor() );
+  CoreEventInterface& coreEventInterface = Internal::Adaptor::Adaptor::GetImplementation(GetAdaptor());
   coreEventInterface.ProcessCoreEvents();
 }
 
@@ -295,61 +470,114 @@ void Application::OnReset()
    * because Application class already handled initialization in OnInit(), OnReset do nothing.
    */
   Dali::Application application(this);
-  mResetSignal.Emit( application );
+  mResetSignal.Emit(application);
 }
 
-void Application::OnAppControl(void *data)
+void Application::OnAppControl(voiddata)
 {
   Dali::Application application(this);
-  mAppControlSignal.Emit( application , data );
+  mAppControlSignal.Emit(application, data);
 }
 
 void Application::OnLanguageChanged()
 {
   mAdaptor->NotifyLanguageChanged();
   Dali::Application application(this);
-  mLanguageChangedSignal.Emit( application );
+  mLanguageChangedSignal.Emit(application);
 }
 
 void Application::OnRegionChanged()
 {
   Dali::Application application(this);
-  mRegionChangedSignal.Emit( application );
+  mRegionChangedSignal.Emit(application);
+}
+
+void Application::OnBatteryLow(Dali::DeviceStatus::Battery::Status status)
+{
+  Dali::Application application(this);
+  mLowBatterySignal.Emit(status);
 }
 
-void Application::OnBatteryLow( Dali::DeviceStatus::Battery::Status status )
+void Application::OnMemoryLow(Dali::DeviceStatus::Memory::Status status)
 {
   Dali::Application application(this);
-  mLowBatterySignal.Emit( status );
+  mLowMemorySignal.Emit(status);
 }
 
-void Application::OnMemoryLow( Dali::DeviceStatus::Memory::Status status )
+void Application::OnDeviceOrientationChanged(Dali::DeviceStatus::Orientation::Status status)
 {
   Dali::Application application(this);
-  mLowMemorySignal.Emit( status );
+  mDeviceOrientationChangedSignal.Emit(status);
 }
 
-void Application::OnSurfaceCreated( Any newSurface )
+void Application::OnSurfaceCreated(Any newSurface)
 {
-  void* newWindow = AnyCast< void* >( newSurface );
-  void* oldWindow = AnyCast< void* >( mMainWindow.GetNativeHandle() );
-  if( oldWindow != newWindow )
+  void* newWindow = AnyCast<void*>(newSurface);
+  void* oldWindow = AnyCast<void*>(mMainWindow.GetNativeHandle());
+  if(oldWindow != newWindow)
   {
-    auto renderSurfaceFactory = Dali::Internal::Adaptor::GetRenderSurfaceFactory();
-    std::unique_ptr< WindowRenderSurface > newSurfacePtr
-      = renderSurfaceFactory->CreateWindowRenderSurface( PositionSize(), newSurface, true );
+    auto                                 renderSurfaceFactory = Dali::Internal::Adaptor::GetRenderSurfaceFactory();
+    std::unique_ptr<WindowRenderSurface> newSurfacePtr        = renderSurfaceFactory->CreateWindowRenderSurface(PositionSize(), newSurface, true);
 
-    mAdaptor->ReplaceSurface( mMainWindow, *newSurfacePtr.release() );
+    mAdaptor->ReplaceSurface(mMainWindow, *newSurfacePtr.release());
   }
 }
 
-void Application::OnSurfaceDestroyed( Any surface )
+void Application::OnSurfaceDestroyed(Any surface)
 {
 }
 
-bool Application::AddIdle( CallbackBase* callback, bool hasReturnValue )
+void Application::OnTaskInit()
 {
-  return mAdaptor->AddIdle( callback, hasReturnValue );
+  Dali::Application application(this);
+  mTaskInitSignal.Emit(application);
+}
+
+void Application::OnTaskTerminate()
+{
+  Dali::Application application(this);
+  mTaskTerminateSignal.Emit(application);
+}
+
+void Application::OnTaskAppControl(void* data)
+{
+  Dali::Application application(this);
+  mTaskAppControlSignal.Emit(application, data);
+}
+
+void Application::OnTaskLanguageChanged()
+{
+  Dali::Application application(this);
+  mTaskLanguageChangedSignal.Emit(application);
+}
+
+void Application::OnTaskRegionChanged()
+{
+  Dali::Application application(this);
+  mTaskRegionChangedSignal.Emit(application);
+}
+
+void Application::OnTaskBatteryLow(Dali::DeviceStatus::Battery::Status status)
+{
+  Dali::Application application(this);
+  mTaskLowBatterySignal.Emit(status);
+}
+
+void Application::OnTaskMemoryLow(Dali::DeviceStatus::Memory::Status status)
+{
+  Dali::Application application(this);
+  mTaskLowMemorySignal.Emit(status);
+}
+
+void Application::OnTaskDeviceOrientationChanged(Dali::DeviceStatus::Orientation::Status status)
+{
+  Dali::Application application(this);
+  mTaskDeviceOrientationChangedSignal.Emit(status);
+}
+
+bool Application::AddIdle(CallbackBase* callback, bool hasReturnValue)
+{
+  return mAdaptor->AddIdle(callback, hasReturnValue);
 }
 
 std::string Application::GetRegion() const
@@ -365,7 +593,7 @@ std::string Application::GetLanguage() const
 Dali::ObjectRegistry Application::GetObjectRegistry() const
 {
   Dali::ObjectRegistry objectRegistry;
-  if( mAdaptor )
+  if(mAdaptor)
   {
     objectRegistry = mAdaptor->GetObjectRegistry();
   }
@@ -384,31 +612,61 @@ Dali::Window Application::GetWindow()
 
 std::string Application::GetResourcePath()
 {
-  return Internal::Adaptor::Framework::GetResourcePath();
+  return SystemSettings::GetResourcePath();
 }
 
 std::string Application::GetDataPath()
 {
-  return Internal::Adaptor::Framework::GetDataPath();
+  return SystemSettings::GetDataPath();
+}
+
+void Application::FlushUpdateMessages()
+{
+  Internal::Adaptor::Adaptor::GetImplementation(*mAdaptor).FlushUpdateMessages();
 }
 
-void Application::SetStyleSheet( const std::string& stylesheet )
+void Application::SetStyleSheet(const std::string& stylesheet)
 {
   mStylesheet = stylesheet;
 }
 
-void Application::SetCommandLineOptions( int* argc, char **argv[] )
+void Application::SetCommandLineOptions(int* argc, char** argv[])
 {
   delete mCommandLineOptions;
 
-  mCommandLineOptions = new CommandLineOptions( argc, argv );
+  mCommandLineOptions = new CommandLineOptions(argc, argv);
+
+  mFramework->SetCommandLineOptions(argc, argv);
+
+  if(argc && (*argc > 0))
+  {
+    // Set mName from command-line args
+    mMainWindowName = (*argv)[0];
+  }
+}
+
+void Application::SetDefaultWindowType(WindowType type)
+{
+  mDefaultWindowType = type;
+  mMainWindow.SetType(type);
+}
 
-  mFramework->SetCommandLineOptions( argc, argv );
+int32_t Application::GetRenderThreadId() const
+{
+  if(mAdaptor)
+  {
+    return Internal::Adaptor::Adaptor::GetImplementation(*mAdaptor).GetRenderThreadId();
+  }
+  return 0;
 }
 
 ApplicationPtr Application::GetPreInitializedApplication()
 {
-  return gPreInitializedApplication;
+  // Reset the handle to decrease the reference count
+  ApplicationPtr application = gPreInitializedApplication;
+  gPreInitializedApplication.Reset();
+
+  return application;
 }
 
 } // namespace Adaptor