Migration of devel api to public

Conflicts:
	Tizen.NUI/src/public/Window.cs

Change-Id: I32d630f1b358559fbe5a62d3e457d00245d66802

diff --git a/Tizen.NUI/src/internal/NDalicPINVOKE.cs b/Tizen.NUI/src/internal/NDalicPINVOKE.cs
index 3feedb3..eb3584d 100755 (executable)
--- a/Tizen.NUI/src/internal/NDalicPINVOKE.cs
+++ b/Tizen.NUI/src/internal/NDalicPINVOKE.cs
@@ -6263,11 +6263,11 @@ class NDalicPINVOKE {
   [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_IsOpaqueState")]
   public static extern bool IsOpaqueState(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_SetScreenMode")]
-  public static extern bool SetScreenMode(global::System.Runtime.InteropServices.HandleRef jarg1, int jarg2);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_SetScreenOffMode")]
+  public static extern bool SetScreenOffMode(global::System.Runtime.InteropServices.HandleRef jarg1, int jarg2);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_GetScreenMode")]
-  public static extern int GetScreenMode(global::System.Runtime.InteropServices.HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_GetScreenOffMode")]
+  public static extern int GetScreenOffMode(global::System.Runtime.InteropServices.HandleRef jarg1);
 
   [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_SetBrightness")]
   public static extern bool SetBrightness(global::System.Runtime.InteropServices.HandleRef jarg1, int jarg2);

diff --git a/Tizen.NUI/src/public/NUIConstants.cs b/Tizen.NUI/src/public/NUIConstants.cs
index 5f58a09..f1506a8 100755 (executable)
--- a/Tizen.NUI/src/public/NUIConstants.cs
+++ b/Tizen.NUI/src/public/NUIConstants.cs
@@ -1395,15 +1395,15 @@ namespace Tizen.NUI
     /// <summary>
     /// An enum of screen mode.
     /// </summary>
-    public enum ScreenMode {
+    public enum ScreenOffMode {
         /// <summary>
         /// The mode which turns the screen off after a timeout.
         /// </summary>
-        Default,
+        Timout,
         /// <summary>
         /// The mode which keeps the screen turned on.
         /// </summary>
-        AlwaysOn
+        Never
     }
 
     /// <summary>

diff --git a/Tizen.NUI/src/public/Window.cs b/Tizen.NUI/src/public/Window.cs
index 5c39f3f..dd7055f 100755 (executable)
--- a/Tizen.NUI/src/public/Window.cs
+++ b/Tizen.NUI/src/public/Window.cs
@@ -342,12 +342,12 @@ namespace Tizen.NUI
         }
 
         /// <summary>
-        /// Sets a window's screen mode.
+        /// Sets a window's screen off mode.
         /// </summary>
-        /// <param name="screenMode">The screen mode.</param>
+        /// <param name="screenOffMode">The screen mode.</param>
         /// <returns>True if no error occurred, false otherwise.</returns>
-        public bool SetScreenMode(ScreenMode screenMode) {
-            bool ret = NDalicPINVOKE.SetScreenMode(swigCPtr, (int)screenMode);
+        public bool SetScreenOffMode(ScreenOffMode screenOffMode) {
+            bool ret = NDalicPINVOKE.SetScreenOffMode(swigCPtr, (int)screenOffMode);
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             return ret;
         }
@@ -355,9 +355,9 @@ namespace Tizen.NUI
         /// <summary>
         /// Gets the screen mode of the window.
         /// </summary>
-        /// <returns>The screen mode.</returns>
-        public ScreenMode GetScreenMode() {
-            ScreenMode ret = (ScreenMode)NDalicPINVOKE.GetScreenMode(swigCPtr);
+        /// <returns>The screen off mode.</returns>
+        public ScreenOffMode GetScreenOffMode() {
+            ScreenOffMode ret = (ScreenOffMode)NDalicPINVOKE.GetScreenOffMode(swigCPtr);
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             return ret;
         }