Revert "[4.0] Enhance application device signal"

[platform/core/uifw/dali-adaptor.git] / adaptors / common / application-impl.cpp

diff --git a/adaptors/common/application-impl.cpp b/adaptors/common/application-impl.cpp
index d4ef798..5e73d5e 100644 (file)
--- a/adaptors/common/application-impl.cpp
+++ b/adaptors/common/application-impl.cpp
@@ -146,12 +146,6 @@ void Application::CreateWindow()
   const std::string& windowClassName = mEnvironmentOptions.GetWindowClassName();
   mWindow = Dali::Window::New( mWindowPositionSize, mName, windowClassName, mWindowMode == Dali::Application::TRANSPARENT );
 
-  int indicatorVisibleMode = mEnvironmentOptions.GetIndicatorVisibleMode();
-  if( indicatorVisibleMode >= Dali::Window::INVISIBLE && indicatorVisibleMode <= Dali::Window::AUTO )
-  {
-    GetImplementation( mWindow ).SetIndicatorVisibleMode( static_cast< Dali::Window::IndicatorVisibleMode >( indicatorVisibleMode ) );
-  }
-
   // Quit the application when the window is closed
   GetImplementation( mWindow ).DeleteRequestSignal().Connect( mSlotDelegate, &Application::Quit );
 }
@@ -332,34 +326,31 @@ void Application::OnAppControl(void *data)
   mAppControlSignal.Emit( application , data );
 }
 
-void Application::OnLanguageChanged( const std::string& language )
+void Application::OnLanguageChanged()
 {
-  mLanguage = language;
   DoLanguageChange();
   Dali::Application application(this);
   mLanguageChangedSignal.Emit( application );
 }
 
-void Application::OnRegionChanged( const std::string& region )
+void Application::OnRegionChanged()
 {
-  mRegion = region;
   Dali::Application application(this);
   mRegionChangedSignal.Emit( application );
 }
 
-void Application::OnBatteryLow( Dali::DevelApplication::BatteryStatus::Type status )
+void Application::OnBatteryLow()
 {
   Dali::Application application(this);
   mBatteryLowSignal.Emit( application );
-  mLowBatterySignal.Emit( status );
 }
 
-void Application::OnMemoryLow( Dali::DevelApplication::MemoryStatus::Type status )
+void Application::OnMemoryLow()
 {
   Dali::Application application(this);
   mMemoryLowSignal.Emit( application );
-  mLowMemorySignal.Emit( status );
 }
+
 void Application::OnResize(Dali::Adaptor& adaptor)
 {
   Dali::Application application(this);
@@ -371,16 +362,6 @@ bool Application::AddIdle( CallbackBase* callback )
   return mAdaptor->AddIdle( callback );
 }
 
-std::string Application::GetRegion()
-{
-  return mRegion;
-}
-
-std::string Application::GetLanguage()
-{
-  return mLanguage;
-}
-
 Dali::Adaptor& Application::GetAdaptor()
 {
   return *mAdaptor;
@@ -419,13 +400,7 @@ void Application::ReplaceWindow( const PositionSize& positionSize, const std::st
   Dali::Window newWindow = Dali::Window::New( positionSize, name, mWindowMode == Dali::Application::TRANSPARENT );
   Window& windowImpl = GetImplementation(newWindow);
   windowImpl.SetAdaptor(*mAdaptor);
-
-  int indicatorVisibleMode = mEnvironmentOptions.GetIndicatorVisibleMode();
-  if( indicatorVisibleMode >= Dali::Window::INVISIBLE && indicatorVisibleMode <= Dali::Window::AUTO )
-  {
-    GetImplementation( newWindow ).SetIndicatorVisibleMode( static_cast< Dali::Window::IndicatorVisibleMode >( indicatorVisibleMode ) );
-  }
-
+  newWindow.ShowIndicator(Dali::Window::INVISIBLE);
   Dali::RenderSurface* renderSurface = windowImpl.GetSurface();
 
   Any nativeWindow = newWindow.GetNativeHandle();