From: Seoyeon Kim Date: Thu, 18 Jan 2018 01:45:31 +0000 (+0000) Subject: Merge "[4.0] Initialize WatchApplication mState" into tizen_4.0 X-Git-Tag: accepted/tizen/4.0/unified/20180119.060734~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9aa727ffdd8d8c2c9ae7db4d9c9a8a687e254602;hp=2aa3302c6c695c9fb095c19d2ddba73b5985be3f;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git Merge "[4.0] Initialize WatchApplication mState" into tizen_4.0 --- diff --git a/adaptors/wearable/watch-application-impl.cpp b/adaptors/wearable/watch-application-impl.cpp index dd5b004..c0fc0e5 100755 --- a/adaptors/wearable/watch-application-impl.cpp +++ b/adaptors/wearable/watch-application-impl.cpp @@ -38,7 +38,8 @@ WatchApplicationPtr WatchApplication::New( } WatchApplication::WatchApplication( int* argc, char** argv[], const std::string& stylesheet, Dali::Application::WINDOW_MODE windowMode ) -: Application(argc, argv, stylesheet, windowMode, PositionSize(), Framework::WATCH) +: Application(argc, argv, stylesheet, windowMode, PositionSize(), Framework::WATCH), + mState( UNINITIALIZED ) { } diff --git a/adaptors/wearable/watch-application-impl.h b/adaptors/wearable/watch-application-impl.h index 0c9b723..9c162b4 100755 --- a/adaptors/wearable/watch-application-impl.h +++ b/adaptors/wearable/watch-application-impl.h @@ -37,6 +37,7 @@ typedef IntrusivePtr WatchApplicationPtr; enum WatchApplicationState { + UNINITIALIZED, INITIALIZED, PAUSED, RESUMED = INITIALIZED,