From bae0ecab629951c0ff9a0e07c560db837385cf74 Mon Sep 17 00:00:00 2001 From: "minho.sun" Date: Mon, 14 Aug 2017 16:43:40 +0900 Subject: [PATCH] Revert "[Tizen] Add OnPreCreate and change OnPause OnResume to virtual function" This reverts commit 69f85ef188c318aa57841c4eb245a909116ff8e8. Change-Id: I3e20046c3a37805909694dd3920f2e0062a958cd --- Tizen.NUI/Tizen.NUI.csproj | 4 ++-- Tizen.NUI/src/internal/NUICoreBackend.cs | 10 +++------- Tizen.NUI/src/public/NUIApplication.cs | 17 +++++------------ packaging/csapi-nui.spec | 3 ++- 4 files changed, 12 insertions(+), 22 deletions(-) diff --git a/Tizen.NUI/Tizen.NUI.csproj b/Tizen.NUI/Tizen.NUI.csproj index ea4d092..1ae98bb 100755 --- a/Tizen.NUI/Tizen.NUI.csproj +++ b/Tizen.NUI/Tizen.NUI.csproj @@ -1,7 +1,7 @@  - 0.2.50 + 0.2.49 Samsung Electronics © Samsung Electronics Co., Ltd All Rights Reserved @@ -25,7 +25,7 @@ - + diff --git a/Tizen.NUI/src/internal/NUICoreBackend.cs b/Tizen.NUI/src/internal/NUICoreBackend.cs index efa71e0..20dff95 100755 --- a/Tizen.NUI/src/internal/NUICoreBackend.cs +++ b/Tizen.NUI/src/internal/NUICoreBackend.cs @@ -179,13 +179,9 @@ namespace Tizen.NUI /// Event argument for Initialized private void OnInitialized(object source, NUIApplicationInitEventArgs e) { - Log.Debug("NUI", "NUICorebackend OnPreCreated Called"); - var preCreateHandler = Handlers[EventType.PreCreated] as Action; - preCreateHandler?.Invoke(); - - Log.Debug("NUI", "NUICorebackend OnCreate Called"); - var createHandler = Handlers[EventType.Created] as Action; - createHandler?.Invoke(); + Log.Debug("NUI", "NUICorebackend OnInitialized Called"); + var handler = Handlers[EventType.Created] as Action; + handler?.Invoke(); } /// diff --git a/Tizen.NUI/src/public/NUIApplication.cs b/Tizen.NUI/src/public/NUIApplication.cs index 3f7823d..2221036 100755 --- a/Tizen.NUI/src/public/NUIApplication.cs +++ b/Tizen.NUI/src/public/NUIApplication.cs @@ -95,22 +95,16 @@ namespace Tizen.NUI /// /// Overrides this method if want to handle behavior. /// - protected virtual void OnPause() + protected void OnPause() { } /// /// Overrides this method if want to handle behavior. /// - protected virtual void OnResume() - { - } - - /// - /// Overrides this method if want to handle behavior. - /// - protected virtual void OnPreCreate() + protected void OnResume() { + Log.Debug("NUI", "OnResume() is called!"); } /// @@ -156,16 +150,15 @@ namespace Tizen.NUI } argsClone[0] = string.Empty; - Backend.AddEventHandler(EventType.PreCreated, OnPreCreate); - Backend.AddEventHandler(EventType.Created, OnCreate); - Backend.AddEventHandler(EventType.AppControlReceived, OnAppControlReceived); Backend.AddEventHandler(EventType.Resumed, OnResume); + Backend.AddEventHandler(EventType.AppControlReceived, OnAppControlReceived); Backend.AddEventHandler(EventType.Paused, OnPause); Backend.AddEventHandler(EventType.Terminated, OnTerminate); Backend.AddEventHandler(EventType.RegionFormatChanged, OnRegionFormatChanged); Backend.AddEventHandler(EventType.LowMemory, OnLowMemory); Backend.AddEventHandler(EventType.LowBattery, OnLowBattery); Backend.AddEventHandler(EventType.LocaleChanged, OnLocaleChanged); + Backend.AddEventHandler(EventType.Created, OnCreate); Backend.Run(argsClone); } diff --git a/packaging/csapi-nui.spec b/packaging/csapi-nui.spec index 368060b..ebde663 100755 --- a/packaging/csapi-nui.spec +++ b/packaging/csapi-nui.spec @@ -1,7 +1,8 @@ Name: csapi-nui Summary: dali-NUI -Version: 0.2.50 +Version: 0.2.48.pre1 Release: 1 +Group: Development/Libraries License: Apache-2.0 and BSD-3-Clause and MIT URL: https://www.tizen.org Source0: %{name}-%{version}.tar.gz -- 2.7.4