From: Jinho, Lee Date: Thu, 28 Sep 2017 04:31:57 +0000 (+0900) Subject: Revert "Enhance application device signal" X-Git-Tag: accepted/tizen/4.0/unified/20171010.163017~30 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git;a=commitdiff_plain;h=e9fe045a302d16a1372317c7ec7ff77ff25fcefc Revert "Enhance application device signal" This reverts commit ae37a5866286d97378c956ff9b55efb0e8c565e8. Change-Id: Ic0a22dbd005fd5d43d056252fe9e61586ca49c4c --- diff --git a/adaptors/common/application-impl.cpp b/adaptors/common/application-impl.cpp index c44cdfb..5e73d5e 100644 --- a/adaptors/common/application-impl.cpp +++ b/adaptors/common/application-impl.cpp @@ -326,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); @@ -365,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; diff --git a/adaptors/common/application-impl.h b/adaptors/common/application-impl.h index b7e4bb2..621facc 100644 --- a/adaptors/common/application-impl.h +++ b/adaptors/common/application-impl.h @@ -24,7 +24,6 @@ // INTERNAL INCLUDES #include -#include #include #include @@ -126,16 +125,6 @@ public: Dali::Window GetWindow(); /** - * @copydoc Dali::DevelApplication::GetRegion(); - */ - std::string GetRegion(); - - /** - * @copydoc Dali::DevelApplication::GetLanguage(); - */ - std::string GetLanguage(); - - /** * @copydoc Dali::Application::ReplaceWindow(); */ void ReplaceWindow( const PositionSize& positionSize, const std::string& name); @@ -242,22 +231,22 @@ public: // From Framework::Observer /** * Called when the framework informs the application that the language of the device has changed. */ - virtual void OnLanguageChanged( const std::string& language ); + virtual void OnLanguageChanged(); /** * Called when the framework informs the application that the region of the device has changed. */ - virtual void OnRegionChanged( const std::string& region ); + virtual void OnRegionChanged(); /** * Called when the framework informs the application that the battery level of the device is low. */ - virtual void OnBatteryLow( Dali::DevelApplication::BatteryStatus::Type status ); + virtual void OnBatteryLow(); /** * Called when the framework informs the application that the memory level of the device is low. */ - virtual void OnMemoryLow( Dali::DevelApplication::MemoryStatus::Type status ); + virtual void OnMemoryLow(); public: @@ -331,16 +320,6 @@ public: // Signals */ Dali::Application::AppSignalType& MemoryLowSignal() { return mMemoryLowSignal; } - /** - * @copydoc Dali::DevelApplication::LowBatterySignal() - */ - Dali::DevelApplication::LowBatterySignalType& LowBatterySignal() { return mLowBatterySignal; } - - /** - * @copydoc Dali::DevelApplication:::LowMemorySignal() - */ - Dali::DevelApplication::LowMemorySignalType& LowMemorySignal() { return mLowMemorySignal; } - protected: /** @@ -381,19 +360,17 @@ protected: private: - AppSignalType mInitSignal; - AppSignalType mTerminateSignal; - AppSignalType mPauseSignal; - AppSignalType mResumeSignal; - AppSignalType mResetSignal; - AppSignalType mResizeSignal; - AppControlSignalType mAppControlSignal; - AppSignalType mLanguageChangedSignal; - AppSignalType mRegionChangedSignal; - AppSignalType mBatteryLowSignal; - AppSignalType mMemoryLowSignal; - Dali::DevelApplication::LowBatterySignalType mLowBatterySignal; - Dali::DevelApplication::LowMemorySignalType mLowMemorySignal; + AppSignalType mInitSignal; + AppSignalType mTerminateSignal; + AppSignalType mPauseSignal; + AppSignalType mResumeSignal; + AppSignalType mResetSignal; + AppSignalType mResizeSignal; + AppControlSignalType mAppControlSignal; + AppSignalType mLanguageChangedSignal; + AppSignalType mRegionChangedSignal; + AppSignalType mBatteryLowSignal; + AppSignalType mMemoryLowSignal; EventLoop* mEventLoop; Framework* mFramework; @@ -401,18 +378,16 @@ private: Dali::Configuration::ContextLoss mContextLossConfiguration; CommandLineOptions* mCommandLineOptions; - Dali::SingletonService mSingletonService; - Dali::Adaptor* mAdaptor; - Dali::Window mWindow; - Dali::Application::WINDOW_MODE mWindowMode; - std::string mName; - std::string mStylesheet; - std::string mLanguage; - std::string mRegion; - EnvironmentOptions mEnvironmentOptions; - PositionSize mWindowPositionSize; - Launchpad::State mLaunchpadState; - bool mUseRemoteSurface; + Dali::SingletonService mSingletonService; + Dali::Adaptor* mAdaptor; + Dali::Window mWindow; + Dali::Application::WINDOW_MODE mWindowMode; + std::string mName; + std::string mStylesheet; + EnvironmentOptions mEnvironmentOptions; + PositionSize mWindowPositionSize; + Launchpad::State mLaunchpadState; + bool mUseRemoteSurface; SlotDelegate< Application > mSlotDelegate; diff --git a/adaptors/common/framework.h b/adaptors/common/framework.h index 7dcbdbc..36115f2 100644 --- a/adaptors/common/framework.h +++ b/adaptors/common/framework.h @@ -20,7 +20,6 @@ // EXTERNAL INCLUDES #include -#include #include #ifdef APPCORE_WATCH_AVAILABLE #include "wearable/watch/watch-application.h" @@ -114,22 +113,22 @@ public: /** * Invoked when the language of the device is changed. */ - virtual void OnLanguageChanged( const std::string& language ) {} + virtual void OnLanguageChanged() {} /** * Invoked when the region is changed. */ - virtual void OnRegionChanged( const std::string& region ) {} + virtual void OnRegionChanged() {} /** * Invoked when the battery level of the device is low. */ - virtual void OnBatteryLow( Dali::DevelApplication::BatteryStatus::Type status ) {} + virtual void OnBatteryLow() {} /** * Invoked when the memory level of the device is low. */ - virtual void OnMemoryLow( Dali::DevelApplication::MemoryStatus::Type status ) {} + virtual void OnMemoryLow() {} }; public: diff --git a/adaptors/devel-api/adaptor-framework/application-devel.cpp b/adaptors/devel-api/adaptor-framework/application-devel.cpp index c597354..51b379c 100644 --- a/adaptors/devel-api/adaptor-framework/application-devel.cpp +++ b/adaptors/devel-api/adaptor-framework/application-devel.cpp @@ -55,26 +55,6 @@ void PreInitialize( int* argc, char** argv[] ) Internal::Adaptor::Application::PreInitialize( argc, argv ); } -std::string GetRegion( Application application ) -{ - return Internal::Adaptor::GetImplementation( application ).GetRegion(); -} - -std::string GetLanguage( Application application ) -{ - return Internal::Adaptor::GetImplementation( application ).GetLanguage(); -} - -LowBatterySignalType& LowBatterySignal( Application application ) -{ - return Internal::Adaptor::GetImplementation( application ).LowBatterySignal(); -} - -LowMemorySignalType& LowMemorySignal( Application application ) -{ - return Internal::Adaptor::GetImplementation( application ).LowMemorySignal(); -} - } // namespace DevelApplication } // namespace Dali diff --git a/adaptors/devel-api/adaptor-framework/application-devel.h b/adaptors/devel-api/adaptor-framework/application-devel.h index 76e1c83..d29c487 100644 --- a/adaptors/devel-api/adaptor-framework/application-devel.h +++ b/adaptors/devel-api/adaptor-framework/application-devel.h @@ -31,59 +31,6 @@ namespace Dali namespace DevelApplication { -/* - * @brief An enum of memory status. - */ -struct MemoryStatus -{ - enum Type - { - /* - * Normal status. - */ - NORMAL, - - /* - * Soft warning status. - */ - SOFT_WARNING, - - /* - * Hard warning status. - */ - HARD_WARNING - }; -}; - -/* - * @brief An enum of battery status. - */ -struct BatteryStatus -{ - enum Type - { - /* - * Normal status. - * Battery status is over 5%. - */ - NORMAL, - - /* - * Battery status is under 5%. - */ - CRITICAL_LOW, - - /* - * Device can be turned off anytime. - * Battery status is under 1%. - */ - POWER_OFF - }; -}; - -typedef Signal< void (BatteryStatus::Type) > LowBatterySignalType; -typedef Signal< void (MemoryStatus::Type) > LowMemorySignalType; - /** * @brief This is the constructor for applications. * @@ -108,35 +55,6 @@ DALI_IMPORT_API Application New( int* argc, char **argv[], const std::string& st */ DALI_IMPORT_API void PreInitialize( int* argc, char** argv[] ); -/** - * @brief This is used to get region information from device. - * - * @return Region information - */ -DALI_IMPORT_API std::string GetRegion( Application application ); - -/** - * @brief This is used to get language information from device. - * - * @return Language information - */ -DALI_IMPORT_API std::string GetLanguage( Application application ); - -/** - * @brief This signal is emitted when the battery level of the device is low. - * @SINCE_1_0.0 - * @return The signal to connect to - */ -DALI_IMPORT_API LowBatterySignalType& LowBatterySignal( Application application ); - -/** - * @brief This signal is emitted when the memory level of the device is low. - * @SINCE_1_0.0 - * @return The signal to connect to - */ -DALI_IMPORT_API LowMemorySignalType& LowMemorySignal( Application application ); - - } // namespace DevelApplication } // namespace Dali diff --git a/adaptors/public-api/adaptor-framework/application.h b/adaptors/public-api/adaptor-framework/application.h index d36416b..9e215c9 100644 --- a/adaptors/public-api/adaptor-framework/application.h +++ b/adaptors/public-api/adaptor-framework/application.h @@ -108,7 +108,6 @@ class DALI_IMPORT_API Application : public BaseHandle { public: - typedef Signal< void (Application&) > AppSignalType; ///< Application lifecycle signal and system signal callback type @SINCE_1_0.0 typedef Signal< void (Application&, void *) > AppControlSignalType; ///< Application control signal callback type @SINCE_1_0.0 @@ -285,6 +284,7 @@ public: */ static std::string GetResourcePath(); + public: // Stereoscopy /** @@ -393,20 +393,18 @@ public: // Signals AppSignalType& RegionChangedSignal(); /** - * @DEPRECATED_1_2.58 Use LowBatterySignal() instead. * @brief This signal is emitted when the battery level of the device is low. * @SINCE_1_0.0 * @return The signal to connect to */ - AppSignalType& BatteryLowSignal() DALI_DEPRECATED_API; + AppSignalType& BatteryLowSignal(); /** - * @DEPRECATED_1_2.58 Use LowMemorySignal() instead. * @brief This signal is emitted when the memory level of the device is low. * @SINCE_1_0.0 * @return The signal to connect to */ - AppSignalType& MemoryLowSignal() DALI_DEPRECATED_API; + AppSignalType& MemoryLowSignal(); public: // Not intended for application developers /// @cond internal diff --git a/adaptors/tizen/framework-tizen-3.cpp b/adaptors/tizen/framework-tizen-3.cpp index be71dff..aeb25c5 100644 --- a/adaptors/tizen/framework-tizen-3.cpp +++ b/adaptors/tizen/framework-tizen-3.cpp @@ -291,7 +291,8 @@ struct Framework::Impl static void AppLanguageChanged(app_event_info_h event, void *data) { Observer *observer = &static_cast(data)->mObserver; - observer->OnLanguageChanged(""); + + observer->OnLanguageChanged(); } static void AppDeviceRotated(app_event_info_h event_info, void *data) @@ -301,19 +302,22 @@ struct Framework::Impl static void AppRegionChanged(app_event_info_h event, void *data) { Observer *observer = &static_cast(data)->mObserver; - observer->OnRegionChanged(""); + + observer->OnRegionChanged(); } static void AppBatteryLow(app_event_info_h event, void *data) { Observer *observer = &static_cast(data)->mObserver; - observer->OnBatteryLow(Dali::DevelApplication::BatteryStatus::NORMAL); + + observer->OnBatteryLow(); } static void AppMemoryLow(app_event_info_h event, void *data) { Observer *observer = &static_cast(data)->mObserver; - observer->OnMemoryLow(Dali::DevelApplication::MemoryStatus::NORMAL); + + observer->OnMemoryLow(); } private: diff --git a/adaptors/tizen/framework-tizen.cpp b/adaptors/tizen/framework-tizen.cpp index 7ff0c32..013435a 100644 --- a/adaptors/tizen/framework-tizen.cpp +++ b/adaptors/tizen/framework-tizen.cpp @@ -383,8 +383,8 @@ struct Framework::Impl static void AppLanguageChanged(AppCore::AppEventInfoPtr event, void *data) { Observer *observer = &static_cast(data)->mObserver; - std::string language( static_cast(event->value) ); - observer->OnLanguageChanged(language); + + observer->OnLanguageChanged(); } static void AppDeviceRotated(AppCore::AppEventInfoPtr event_info, void *data) @@ -394,62 +394,22 @@ struct Framework::Impl static void AppRegionChanged(AppCore::AppEventInfoPtr event, void *data) { Observer *observer = &static_cast(data)->mObserver; - std::string region( static_cast(event->value) ); - observer->OnRegionChanged(region); + + observer->OnRegionChanged(); } static void AppBatteryLow(AppCore::AppEventInfoPtr event, void *data) { Observer *observer = &static_cast(data)->mObserver; - int status = *static_cast(event->value); - Dali::DevelApplication::BatteryStatus::Type result = Dali::DevelApplication::BatteryStatus::NORMAL; - // convert to dali battery status - switch( status ) - { - case 1: - { - result = Dali::DevelApplication::BatteryStatus::POWER_OFF; - break; - } - case 2: - { - result = Dali::DevelApplication::BatteryStatus::CRITICAL_LOW; - break; - } - default : - break; - } - observer->OnBatteryLow(result); + observer->OnBatteryLow(); } static void AppMemoryLow(AppCore::AppEventInfoPtr event, void *data) { Observer *observer = &static_cast(data)->mObserver; - int status = *static_cast(event->value); - Dali::DevelApplication::MemoryStatus::Type result = Dali::DevelApplication::MemoryStatus::NORMAL; - // convert to dali memmory status - switch( status ) - { - case 1: - { - result = Dali::DevelApplication::MemoryStatus::NORMAL; - break; - } - case 2: - { - result = Dali::DevelApplication::MemoryStatus::SOFT_WARNING; - break; - } - case 4: - { - result = Dali::DevelApplication::MemoryStatus::HARD_WARNING; - break; - } - default : - break; - } - observer->OnMemoryLow(result); + + observer->OnMemoryLow(); } @@ -1137,6 +1097,34 @@ struct Framework::Impl observer->OnAmbientChanged(ambient); } + static void WatchAppLanguageChanged(app_event_info_h event, void *data) + { + Observer *observer = &static_cast(data)->mObserver; + + observer->OnLanguageChanged(); + } + + static void WatchAppRegionChanged(app_event_info_h event, void *data) + { + Observer *observer = &static_cast(data)->mObserver; + + observer->OnRegionChanged(); + } + + static void WatchAppBatteryLow(app_event_info_h event, void *data) + { + Observer *observer = &static_cast(data)->mObserver; + + observer->OnBatteryLow(); + } + + static void WatchAppMemoryLow(app_event_info_h event, void *data) + { + Observer *observer = &static_cast(data)->mObserver; + + observer->OnMemoryLow(); + } + static void WatchAppControl(app_control_h app_control, void *data) { Framework* framework = static_cast(data); @@ -1186,10 +1174,10 @@ struct Framework::Impl mWatchCallback.ambient_tick = WatchAppAmbientTick; mWatchCallback.ambient_changed = WatchAppAmbientChanged; - AppCore::AppAddEventHandler(&handlers[AppCore::LOW_BATTERY], AppCore::LOW_BATTERY, AppBatteryLow, mFramework); - AppCore::AppAddEventHandler(&handlers[AppCore::LOW_MEMORY], AppCore::LOW_MEMORY, AppMemoryLow, mFramework); - AppCore::AppAddEventHandler(&handlers[AppCore::LANGUAGE_CHANGED], AppCore::LANGUAGE_CHANGED, AppLanguageChanged, mFramework); - AppCore::AppAddEventHandler(&handlers[AppCore::REGION_FORMAT_CHANGED], AppCore::REGION_FORMAT_CHANGED, AppRegionChanged, mFramework); + watch_app_add_event_handler(&watchHandlers[APP_EVENT_LOW_BATTERY], APP_EVENT_LOW_BATTERY, WatchAppBatteryLow, mFramework); + watch_app_add_event_handler(&watchHandlers[APP_EVENT_LOW_MEMORY], APP_EVENT_LOW_MEMORY, WatchAppMemoryLow, mFramework); + watch_app_add_event_handler(&watchHandlers[APP_EVENT_LANGUAGE_CHANGED], APP_EVENT_LANGUAGE_CHANGED, WatchAppLanguageChanged, mFramework); + watch_app_add_event_handler(&watchHandlers[APP_EVENT_REGION_FORMAT_CHANGED], APP_EVENT_REGION_FORMAT_CHANGED, WatchAppRegionChanged, mFramework); ret = watch_app_main(*mFramework->mArgc, *mFramework->mArgv, &mWatchCallback, mFramework); #endif diff --git a/adaptors/ubuntu/framework-ubuntu.cpp b/adaptors/ubuntu/framework-ubuntu.cpp index 1df4c3d..22203cc 100644 --- a/adaptors/ubuntu/framework-ubuntu.cpp +++ b/adaptors/ubuntu/framework-ubuntu.cpp @@ -255,7 +255,7 @@ bool Framework::AppStatusHandler(int type, void *bundleData) break; case APP_LANGUAGE_CHANGE: - mObserver.OnLanguageChanged(""); + mObserver.OnLanguageChanged(); break; default: