Merge "Update LowBatterySignal and LowMemorySignal for application" into tizen_4.0

4 files changed, 27 insertions, 42 deletions

diff --git a/Tizen.NUI/src/internal/Application.cs b/Tizen.NUI/src/internal/Application.cs
index ce3d71e..e4fa432 100755
--- a/Tizen.NUI/src/internal/Application.cs
+++ b/Tizen.NUI/src/internal/Application.cs
@@ -405,15 +405,15 @@ namespace Tizen.NUI
         public enum BatteryStatus
         {
             Normal,
-            CriticalLow,
+            CriticallyLow,
             PowerOff
         };
 
         public enum MemoryStatus
         {
             Normal,
-            SoftWarning,
-            HardWarning
+            Low,
+            CriticallyLow
         };
 
         [UnmanagedFunctionPointer(CallingConvention.StdCall)]
@@ -1340,14 +1340,14 @@ namespace Tizen.NUI
 
         internal LowBatterySignalType BatteryLowSignal()
         {
-            LowBatterySignalType ret = new LowBatterySignalType(NDalicPINVOKE.Application_BatteryLowSignal(swigCPtr), false);
+            LowBatterySignalType ret = new LowBatterySignalType(NDalicPINVOKE.Application_LowBatterySignal(swigCPtr), false);
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             return ret;
         }
 
         internal LowMemorySignalType MemoryLowSignal()
         {
-            LowMemorySignalType ret = new LowMemorySignalType(NDalicPINVOKE.Application_MemoryLowSignal(swigCPtr), false);
+            LowMemorySignalType ret = new LowMemorySignalType(NDalicPINVOKE.Application_LowMemorySignal(swigCPtr), false);
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             return ret;
         }
diff --git a/Tizen.NUI/src/internal/NDalicPINVOKE.cs b/Tizen.NUI/src/internal/NDalicPINVOKE.cs
index 0dd84c7..e95634a 100755
--- a/Tizen.NUI/src/internal/NDalicPINVOKE.cs
+++ b/Tizen.NUI/src/internal/NDalicPINVOKE.cs
@@ -6383,11 +6383,11 @@ class NDalicPINVOKE {
   [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Application_RegionChangedSignal")]
   public static extern global::System.IntPtr Application_RegionChangedSignal(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Application_BatteryLowSignal")]
-  public static extern global::System.IntPtr Application_BatteryLowSignal(global::System.Runtime.InteropServices.HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Application_LowBatterySignal")]
+  public static extern global::System.IntPtr Application_LowBatterySignal(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Application_MemoryLowSignal")]
-  public static extern global::System.IntPtr Application_MemoryLowSignal(global::System.Runtime.InteropServices.HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Application_LowMemorySignal")]
+  public static extern global::System.IntPtr Application_LowMemorySignal(global::System.Runtime.InteropServices.HandleRef jarg1);
 
   [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_ApplicationSignal_Empty")]
   public static extern bool ApplicationSignal_Empty(global::System.Runtime.InteropServices.HandleRef jarg1);
diff --git a/Tizen.NUI/src/internal/NUICoreBackend.cs b/Tizen.NUI/src/internal/NUICoreBackend.cs
index 81c0467..0828ae1 100755
--- a/Tizen.NUI/src/internal/NUICoreBackend.cs
+++ b/Tizen.NUI/src/internal/NUICoreBackend.cs
@@ -20,7 +20,6 @@ using System.Collections.Generic;
 
 using Tizen.Applications.CoreBackend;
 using Tizen.Applications;
-using Tizen.NUI;
 
 namespace Tizen.NUI
 {
@@ -157,9 +156,8 @@ namespace Tizen.NUI
         /// <param name="e">The event argument for RegionChanged.</param>
         private void OnRegionChanged(object source, NUIApplicationRegionChangedEventArgs e)
         {
-            Log.Debug("NUI", "NUICorebackend OnRegionChanged Called");
+            Log.Info("NUI", "NUICorebackend OnRegionChanged Called");
             var handler = Handlers[EventType.RegionFormatChanged] as Action<RegionFormatChangedEventArgs>;
-            // Need to make new signal return in native to return right value.
             handler?.Invoke( new RegionFormatChangedEventArgs(e.Application.GetRegion()));
         }
 
@@ -170,22 +168,22 @@ namespace Tizen.NUI
         /// <param name="e">The event argument for MemoryLow.</param>
         private void OnMemoryLow(object source, NUIApplicationMemoryLowEventArgs e)
         {
-            Log.Debug("NUI", "NUICorebackend OnMemoryLow Called");
+            Log.Info("NUI", "NUICorebackend OnMemoryLow Called");
             var handler = Handlers[EventType.LowMemory] as Action<LowMemoryEventArgs>;
-            // Need to make new signal return in native to return right value.
-            switch( e.MemoryStatus )
+
+            switch ( e.MemoryStatus )
             {
                 case Application.MemoryStatus.Normal:
                 {
-                    handler?.Invoke(new LowMemoryEventArgs(LowMemoryStatus.None));
+                    handler?.Invoke( new LowMemoryEventArgs(LowMemoryStatus.None));
                     break;
                 }
-                case Application.MemoryStatus.SoftWarning:
+                case Application.MemoryStatus.Low:
                 {
                     handler?.Invoke(new LowMemoryEventArgs(LowMemoryStatus.SoftWarning));
                     break;
                 }
-                case Application.MemoryStatus.HardWarning:
+                case Application.MemoryStatus.CriticallyLow:
                 {
                     handler?.Invoke(new LowMemoryEventArgs(LowMemoryStatus.HardWarning));
                     break;
@@ -200,9 +198,8 @@ namespace Tizen.NUI
         /// <param name="e">The event argument for LanguageChanged.</param>
         private void OnLanguageChanged(object source, NUIApplicationLanguageChangedEventArgs e)
         {
-            Log.Debug("NUI", "NUICorebackend OnLanguageChanged Called");
+            Log.Info("NUI", "NUICorebackend OnLanguageChanged Called");
             var handler = Handlers[EventType.LocaleChanged] as Action<LocaleChangedEventArgs>;
-            // Need to make new signal return in native to return right value.
             handler?.Invoke( new LocaleChangedEventArgs(e.Application.GetLanguage()));
         }
 
@@ -213,9 +210,8 @@ namespace Tizen.NUI
         /// <param name="e">The event argument for BatteryLow.</param>
         private void OnBatteryLow(object source, NUIApplicationBatteryLowEventArgs e)
         {
-            Log.Debug("NUI", "NUICorebackend OnBatteryLow Called");
+            Log.Info("NUI", "NUICorebackend OnBatteryLow Called");
             var handler = Handlers[EventType.LowBattery] as Action<LowBatteryEventArgs>;
-            // Need to make new signal return in native to return right value.
             switch( e.BatteryStatus )
             {
                 case Application.BatteryStatus.Normal:
@@ -223,7 +219,7 @@ namespace Tizen.NUI
                     handler?.Invoke(new LowBatteryEventArgs(LowBatteryStatus.None));
                     break;
                 }
-                case Application.BatteryStatus.CriticalLow:
+                case Application.BatteryStatus.CriticallyLow:
                 {
                     handler?.Invoke(new LowBatteryEventArgs(LowBatteryStatus.CriticalLow));
                     break;
@@ -243,11 +239,11 @@ namespace Tizen.NUI
         /// <param name="e">The event argument for Initialized.</param>
         private void OnInitialized(object source, NUIApplicationInitEventArgs e)
         {
-            Log.Debug("NUI", "NUICorebackend OnPreCreated Called");
+            Log.Info("NUI", "NUICorebackend OnPreCreated Called");
             var preCreateHandler = Handlers[EventType.PreCreated] as Action;
             preCreateHandler?.Invoke();
 
-            Log.Debug("NUI", "NUICorebackend OnCreate Called");
+            Log.Info("NUI", "NUICorebackend OnCreate Called");
             var createHandler = Handlers[EventType.Created] as Action;
             createHandler?.Invoke();
         }
@@ -259,7 +255,7 @@ namespace Tizen.NUI
         /// <param name="e">The event argument for Terminated.</param>
         private void OnTerminated(object source, NUIApplicationTerminatingEventArgs e)
         {
-            Log.Debug("NUI", "NUICorebackend OnTerminated Called");
+            Log.Info("NUI", "NUICorebackend OnTerminated Called");
             var handler = Handlers[EventType.Terminated] as Action;
             handler?.Invoke();
         }
@@ -271,7 +267,7 @@ namespace Tizen.NUI
         /// <param name="e">The event argument for Resumed.</param>
         private void OnResumed(object source, NUIApplicationResumedEventArgs e)
         {
-            Log.Debug("NUI", "NUICorebackend OnResumed Called");
+            Log.Info("NUI", "NUICorebackend OnResumed Called");
             var handler = Handlers[EventType.Resumed] as Action;
             handler?.Invoke();
         }
@@ -283,7 +279,7 @@ namespace Tizen.NUI
         /// <param name="e">The event argument for AppControl.</param>
         private void OnAppControl(object source, NUIApplicationAppControlEventArgs e)
         {
-            Log.Debug("NUI", "NUICorebackend OnAppControl Called");
+            Log.Info("NUI", "NUICorebackend OnAppControl Called");
             var handler = Handlers[EventType.AppControlReceived] as Action<AppControlReceivedEventArgs>;
             SafeAppControlHandle handle = new SafeAppControlHandle(e.VoidP,false);
             handler?.Invoke( new AppControlReceivedEventArgs(new ReceivedAppControl(handle)) );
@@ -296,7 +292,7 @@ namespace Tizen.NUI
         /// <param name="e">The event argument for Paused.</param>
         private void OnPaused(object source, NUIApplicationPausedEventArgs e)
         {
-            Log.Debug("NUI", "NUICorebackend OnPaused Called");
+            Log.Info("NUI", "NUICorebackend OnPaused Called");
             var handler = Handlers[EventType.Paused] as Action;
             handler?.Invoke();
         }
diff --git a/Tizen.NUI/src/public/NUIApplication.cs b/Tizen.NUI/src/public/NUIApplication.cs
index 6a4f19d..af60ae8 100755
--- a/Tizen.NUI/src/public/NUIApplication.cs
+++ b/Tizen.NUI/src/public/NUIApplication.cs
@@ -18,7 +18,6 @@
 using System;
 using Tizen.Applications;
 using Tizen.Applications.CoreBackend;
-using Tizen.NUI;
 
 namespace Tizen.NUI
 {
@@ -69,7 +68,6 @@ namespace Tizen.NUI
         /// </summary>
         protected override void OnLocaleChanged(LocaleChangedEventArgs e)
         {
-            Log.Debug("NUI", "OnLocaleChanged() is called!");
             base.OnLocaleChanged(e);
         }
 
@@ -78,7 +76,6 @@ namespace Tizen.NUI
         /// </summary>
         protected override void OnLowBattery(LowBatteryEventArgs e)
         {
-            Log.Debug("NUI", "OnLowBattery() is called!");
             base.OnLowBattery(e);
         }
 
@@ -87,7 +84,6 @@ namespace Tizen.NUI
         /// </summary>
         protected override void OnLowMemory(LowMemoryEventArgs e)
         {
-            Log.Debug("NUI", "OnLowMemory() is called!");
             base.OnLowMemory(e);
         }
 
@@ -96,7 +92,6 @@ namespace Tizen.NUI
         /// </summary>
         protected override void OnRegionFormatChanged(RegionFormatChangedEventArgs e)
         {
-            Log.Debug("NUI", "OnRegionFormatChanged() is called!");
             base.OnRegionFormatChanged(e);
         }
 
@@ -105,7 +100,6 @@ namespace Tizen.NUI
         /// </summary>
         protected override void OnTerminate()
         {
-            Log.Debug("NUI", "OnTerminate() is called!");
             base.OnTerminate();
         }
 
@@ -114,7 +108,6 @@ namespace Tizen.NUI
         /// </summary>
         protected virtual void OnPause()
         {
-            Log.Debug("NUI", "OnPause() is called!");
             Paused?.Invoke(this, EventArgs.Empty);
         }
 
@@ -123,7 +116,6 @@ namespace Tizen.NUI
         /// </summary>
         protected virtual void OnResume()
         {
-            Log.Debug("NUI", "OnResume() is called!");
             Resumed?.Invoke(this, EventArgs.Empty);
         }
 
@@ -132,7 +124,6 @@ namespace Tizen.NUI
         /// </summary>
         protected virtual void OnPreCreate()
         {
-            Log.Debug("NUI", "OnPreCreate() is called!");
         }
 
         /// <summary>
@@ -140,11 +131,10 @@ namespace Tizen.NUI
         /// </summary>
         protected override void OnAppControlReceived(AppControlReceivedEventArgs e)
         {
-            Log.Debug("NUI", "OnAppControlReceived() is called!");
             if (e != null)
             {
-                Log.Debug("NUI", "OnAppControlReceived() is called! ApplicationId=" + e.ReceivedAppControl.ApplicationId);
-                Log.Debug("NUI", "CallerApplicationId=" + e.ReceivedAppControl.CallerApplicationId + "   IsReplyRequest=" + e.ReceivedAppControl.IsReplyRequest);
+                Log.Info("NUI", "OnAppControlReceived() is called! ApplicationId=" + e.ReceivedAppControl.ApplicationId);
+                Log.Info("NUI", "CallerApplicationId=" + e.ReceivedAppControl.CallerApplicationId + "   IsReplyRequest=" + e.ReceivedAppControl.IsReplyRequest);
             }
             base.OnAppControlReceived(e);
         }
@@ -157,7 +147,6 @@ namespace Tizen.NUI
             // This is also required to create DisposeQueue on main thread.
             DisposeQueue disposeQ = DisposeQueue.Instance;
             disposeQ.Initialize();
-            Log.Debug("NUI","OnCreate() is called!");
             base.OnCreate();
         }