Manual merge for nui v0.2.35.

Split namespace for UIComponents.

Change-Id: I45951fb5b1e0f035b351df2fe70b0cf9376448fb
Signed-off-by: Feng Jin <feng16.jin@samsung.com>

diff --git a/src/Tizen.NUI/src/internal/ButtonSignal.cs b/src/Tizen.NUI/src/internal/ButtonSignal.cs
index 47e39df..886ebaf 100755 (executable)
--- a/src/Tizen.NUI/src/internal/ButtonSignal.cs
+++ b/src/Tizen.NUI/src/internal/ButtonSignal.cs
@@ -74,8 +74,8 @@ System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForD
     }
   }
 
-  public bool Emit(Button arg) {
-    bool ret = NDalicPINVOKE.ButtonSignal_Emit(swigCPtr, Button.getCPtr(arg));
+  public bool Emit(Tizen.NUI.UIComponents.Button arg) {
+    bool ret = NDalicPINVOKE.ButtonSignal_Emit(swigCPtr, Tizen.NUI.UIComponents.Button.getCPtr(arg));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }

diff --git a/src/Tizen.NUI/src/internal/KeyInputFocusManager.cs b/src/Tizen.NUI/src/internal/KeyInputFocusManager.cs
index 29e6d69..467b88f 100755 (executable)
--- a/src/Tizen.NUI/src/internal/KeyInputFocusManager.cs
+++ b/src/Tizen.NUI/src/internal/KeyInputFocusManager.cs
@@ -65,24 +65,11 @@ public class KeyInputFocusManager : BaseHandle {
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public bool IsKeyboardListener(View control) {
-    bool ret = NDalicPINVOKE.KeyInputFocusManager_IsKeyboardListener(swigCPtr, View.getCPtr(control));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
   internal SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__Control_Dali__Toolkit__ControlF_t KeyInputFocusChangedSignal() {
     SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__Control_Dali__Toolkit__ControlF_t ret = new SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__Control_Dali__Toolkit__ControlF_t(NDalicPINVOKE.KeyInputFocusManager_KeyInputFocusChangedSignal(swigCPtr), false);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
-
-  internal KeyEventSignal UnhandledKeyEventSignal() {
-    KeyEventSignal ret = new KeyEventSignal(NDalicPINVOKE.KeyInputFocusManager_UnhandledKeyEventSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
 }
 
 }

diff --git a/src/Tizen.NUI/src/internal/NDalicPINVOKE.cs b/src/Tizen.NUI/src/internal/NDalicPINVOKE.cs
index b2274c8..07fdd29 100755 (executable)
--- a/src/Tizen.NUI/src/internal/NDalicPINVOKE.cs
+++ b/src/Tizen.NUI/src/internal/NDalicPINVOKE.cs
@@ -7124,15 +7124,9 @@ class NDalicPINVOKE {
   [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_KeyInputFocusManager_RemoveFocus")]
   public static extern void KeyInputFocusManager_RemoveFocus(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_KeyInputFocusManager_IsKeyboardListener")]
-  public static extern bool KeyInputFocusManager_IsKeyboardListener(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
-
   [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_KeyInputFocusManager_KeyInputFocusChangedSignal")]
   public static extern global::System.IntPtr KeyInputFocusManager_KeyInputFocusChangedSignal(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_KeyInputFocusManager_UnhandledKeyEventSignal")]
-  public static extern global::System.IntPtr KeyInputFocusManager_UnhandledKeyEventSignal(global::System.Runtime.InteropServices.HandleRef jarg1);
-
   [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_new_Alignment_Padding__SWIG_0")]
   public static extern global::System.IntPtr new_Alignment_Padding__SWIG_0();
 

diff --git a/src/Tizen.NUI/src/internal/ProgressBarValueChangedSignal.cs b/src/Tizen.NUI/src/internal/ProgressBarValueChangedSignal.cs
index 1406298..275248a 100755 (executable)
--- a/src/Tizen.NUI/src/internal/ProgressBarValueChangedSignal.cs
+++ b/src/Tizen.NUI/src/internal/ProgressBarValueChangedSignal.cs
@@ -74,8 +74,8 @@ System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForD
     }
   }
 
-  public void Emit(ProgressBar arg1, float arg2, float arg3) {
-    NDalicPINVOKE.ProgressBarValueChangedSignal_Emit(swigCPtr, ProgressBar.getCPtr(arg1), arg2, arg3);
+  public void Emit(Tizen.NUI.UIComponents.ProgressBar arg1, float arg2, float arg3) {
+    NDalicPINVOKE.ProgressBarValueChangedSignal_Emit(swigCPtr, Tizen.NUI.UIComponents.ProgressBar.getCPtr(arg1), arg2, arg3);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 

diff --git a/src/Tizen.NUI/src/internal/SliderMarkReachedSignal.cs b/src/Tizen.NUI/src/internal/SliderMarkReachedSignal.cs
index 366bcb6..f5d3a62 100755 (executable)
--- a/src/Tizen.NUI/src/internal/SliderMarkReachedSignal.cs
+++ b/src/Tizen.NUI/src/internal/SliderMarkReachedSignal.cs
@@ -74,8 +74,8 @@ System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForD
     }
   }
 
-  public bool Emit(Slider arg1, int arg2) {
-    bool ret = NDalicPINVOKE.SliderMarkReachedSignal_Emit(swigCPtr, Slider.getCPtr(arg1), arg2);
+  public bool Emit(Tizen.NUI.UIComponents.Slider arg1, int arg2) {
+    bool ret = NDalicPINVOKE.SliderMarkReachedSignal_Emit(swigCPtr, Tizen.NUI.UIComponents.Slider.getCPtr(arg1), arg2);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }

diff --git a/src/Tizen.NUI/src/internal/SliderValueChangedSignal.cs b/src/Tizen.NUI/src/internal/SliderValueChangedSignal.cs
index 67f5763..d22b923 100755 (executable)
--- a/src/Tizen.NUI/src/internal/SliderValueChangedSignal.cs
+++ b/src/Tizen.NUI/src/internal/SliderValueChangedSignal.cs
@@ -74,8 +74,8 @@ System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForD
     }
   }
 
-  public bool Emit(Slider arg1, float arg2) {
-    bool ret = NDalicPINVOKE.SliderValueChangedSignal_Emit(swigCPtr, Slider.getCPtr(arg1), arg2);
+  public bool Emit(Tizen.NUI.UIComponents.Slider arg1, float arg2) {
+    bool ret = NDalicPINVOKE.SliderValueChangedSignal_Emit(swigCPtr, Tizen.NUI.UIComponents.Slider.getCPtr(arg1), arg2);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }

diff --git a/src/Tizen.NUI/src/internal/TextEditorSignal.cs b/src/Tizen.NUI/src/internal/TextEditorSignal.cs
index c25e4de..b4528e1 100755 (executable)
--- a/src/Tizen.NUI/src/internal/TextEditorSignal.cs
+++ b/src/Tizen.NUI/src/internal/TextEditorSignal.cs
@@ -74,8 +74,8 @@ System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForD
     }
   }
 
-  public void Emit(TextEditor arg) {
-    NDalicPINVOKE.TextEditorSignal_Emit(swigCPtr, TextEditor.getCPtr(arg));
+  public void Emit(Tizen.NUI.UIComponents.TextEditor arg) {
+    NDalicPINVOKE.TextEditorSignal_Emit(swigCPtr, Tizen.NUI.UIComponents.TextEditor.getCPtr(arg));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 

diff --git a/src/Tizen.NUI/src/internal/TextFieldSignal.cs b/src/Tizen.NUI/src/internal/TextFieldSignal.cs
index 8a2b623..3054900 100755 (executable)
--- a/src/Tizen.NUI/src/internal/TextFieldSignal.cs
+++ b/src/Tizen.NUI/src/internal/TextFieldSignal.cs
@@ -74,8 +74,8 @@ System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForD
     }
   }
 
-  public void Emit(TextField arg) {
-    NDalicPINVOKE.TextFieldSignal_Emit(swigCPtr, TextField.getCPtr(arg));
+  public void Emit(Tizen.NUI.UIComponents.TextField arg) {
+    NDalicPINVOKE.TextFieldSignal_Emit(swigCPtr, Tizen.NUI.UIComponents.TextField.getCPtr(arg));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 

diff --git a/src/Tizen.NUI/src/internal/ToggleButton.cs b/src/Tizen.NUI/src/internal/ToggleButton.cs
index b3f5ad1..44e65bd 100755 (executable)
--- a/src/Tizen.NUI/src/internal/ToggleButton.cs
+++ b/src/Tizen.NUI/src/internal/ToggleButton.cs
@@ -26,7 +26,7 @@
 
 namespace Tizen.NUI {
 
-public class ToggleButton : Button {
+public class ToggleButton : Tizen.NUI.UIComponents.Button {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal ToggleButton(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.ToggleButton_SWIGUpcast(cPtr), cMemoryOwn) {

diff --git a/src/Tizen.NUI/src/public/CustomView/Spin.cs b/src/Tizen.NUI/src/public/CustomView/Spin.cs
index 1ab37b2..817eeca 100755 (executable)
--- a/src/Tizen.NUI/src/public/CustomView/Spin.cs
+++ b/src/Tizen.NUI/src/public/CustomView/Spin.cs
@@ -19,6 +19,7 @@
 using System;
 using System.Runtime.InteropServices;
 using Tizen.NUI;
+using Tizen.NUI.UIComponents;
 
 // A spin control (for continously changing values when users can easily predict a set of values)
 

diff --git a/src/Tizen.NUI/src/public/Button.cs b/src/Tizen.NUI/src/public/UIComponents/Button.cs
similarity index 99%
rename from src/Tizen.NUI/src/public/Button.cs
rename to src/Tizen.NUI/src/public/UIComponents/Button.cs
index 1202d09..3b9dd3c 100755 (executable)
--- a/src/Tizen.NUI/src/public/Button.cs
+++ b/src/Tizen.NUI/src/public/UIComponents/Button.cs
@@ -16,7 +16,7 @@
 // This File has been auto-generated by SWIG and then modified using DALi Ruby Scripts
 // Some have been manually changed
 
-namespace Tizen.NUI
+namespace Tizen.NUI.UIComponents
 {
 
     using System;

diff --git a/src/Tizen.NUI/src/public/CheckBoxButton.cs b/src/Tizen.NUI/src/public/UIComponents/CheckBoxButton.cs
similarity index 99%
rename from src/Tizen.NUI/src/public/CheckBoxButton.cs
rename to src/Tizen.NUI/src/public/UIComponents/CheckBoxButton.cs
index 44c953a..3b057a5 100755 (executable)
--- a/src/Tizen.NUI/src/public/CheckBoxButton.cs
+++ b/src/Tizen.NUI/src/public/UIComponents/CheckBoxButton.cs
@@ -16,7 +16,7 @@
 // This File has been auto-generated by SWIG and then modified using DALi Ruby Scripts
 // Some have been manually changed
 
-namespace Tizen.NUI
+namespace Tizen.NUI.UIComponents
 {
 
     /// <summary>

diff --git a/src/Tizen.NUI/src/public/ImageView.cs b/src/Tizen.NUI/src/public/UIComponents/ImageView.cs
similarity index 99%
rename from src/Tizen.NUI/src/public/ImageView.cs
rename to src/Tizen.NUI/src/public/UIComponents/ImageView.cs
index db6e756..7384d0e 100755 (executable)
--- a/src/Tizen.NUI/src/public/ImageView.cs
+++ b/src/Tizen.NUI/src/public/UIComponents/ImageView.cs
@@ -24,7 +24,7 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI
+namespace Tizen.NUI.UIComponents
 {
 
     /// <summary>

diff --git a/src/Tizen.NUI/src/public/Popup.cs b/src/Tizen.NUI/src/public/UIComponents/Popup.cs
similarity index 99%
rename from src/Tizen.NUI/src/public/Popup.cs
rename to src/Tizen.NUI/src/public/UIComponents/Popup.cs
index 3b69235..f35ba4a 100755 (executable)
--- a/src/Tizen.NUI/src/public/Popup.cs
+++ b/src/Tizen.NUI/src/public/UIComponents/Popup.cs
@@ -24,7 +24,7 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI
+namespace Tizen.NUI.UIComponents
 {
 
     using System;

diff --git a/src/Tizen.NUI/src/public/ProgressBar.cs b/src/Tizen.NUI/src/public/UIComponents/ProgressBar.cs
similarity index 99%
rename from src/Tizen.NUI/src/public/ProgressBar.cs
rename to src/Tizen.NUI/src/public/UIComponents/ProgressBar.cs
index 316f746..e59df96 100755 (executable)
--- a/src/Tizen.NUI/src/public/ProgressBar.cs
+++ b/src/Tizen.NUI/src/public/UIComponents/ProgressBar.cs
@@ -24,7 +24,7 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI
+namespace Tizen.NUI.UIComponents
 {
 
     using System;

diff --git a/src/Tizen.NUI/src/public/PushButton.cs b/src/Tizen.NUI/src/public/UIComponents/PushButton.cs
similarity index 99%
rename from src/Tizen.NUI/src/public/PushButton.cs
rename to src/Tizen.NUI/src/public/UIComponents/PushButton.cs
index d5bb54e..a7bde36 100755 (executable)
--- a/src/Tizen.NUI/src/public/PushButton.cs
+++ b/src/Tizen.NUI/src/public/UIComponents/PushButton.cs
@@ -24,7 +24,7 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI
+namespace Tizen.NUI.UIComponents
 {
 
     /// <summary>

diff --git a/src/Tizen.NUI/src/public/RadioButton.cs b/src/Tizen.NUI/src/public/UIComponents/RadioButton.cs
similarity index 99%
rename from src/Tizen.NUI/src/public/RadioButton.cs
rename to src/Tizen.NUI/src/public/UIComponents/RadioButton.cs
index 27af97e..e1f6c70 100755 (executable)
--- a/src/Tizen.NUI/src/public/RadioButton.cs
+++ b/src/Tizen.NUI/src/public/UIComponents/RadioButton.cs
@@ -24,7 +24,7 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI
+namespace Tizen.NUI.UIComponents
 {
 
     /// <summary>

diff --git a/src/Tizen.NUI/src/public/ScrollBar.cs b/src/Tizen.NUI/src/public/UIComponents/ScrollBar.cs
similarity index 99%
rename from src/Tizen.NUI/src/public/ScrollBar.cs
rename to src/Tizen.NUI/src/public/UIComponents/ScrollBar.cs
index 045e1a0..46c07cc 100755 (executable)
--- a/src/Tizen.NUI/src/public/ScrollBar.cs
+++ b/src/Tizen.NUI/src/public/UIComponents/ScrollBar.cs
@@ -24,7 +24,7 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI
+namespace Tizen.NUI.UIComponents
 {
 
     using System;

diff --git a/src/Tizen.NUI/src/public/Slider.cs b/src/Tizen.NUI/src/public/UIComponents/Slider.cs
similarity index 99%
rename from src/Tizen.NUI/src/public/Slider.cs
rename to src/Tizen.NUI/src/public/UIComponents/Slider.cs
index 6d7144f..1e0255f 100755 (executable)
--- a/src/Tizen.NUI/src/public/Slider.cs
+++ b/src/Tizen.NUI/src/public/UIComponents/Slider.cs
@@ -24,7 +24,7 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI
+namespace Tizen.NUI.UIComponents
 {
 
     using System;

diff --git a/src/Tizen.NUI/src/public/TextEditor.cs b/src/Tizen.NUI/src/public/UIComponents/TextEditor.cs
similarity index 99%
rename from src/Tizen.NUI/src/public/TextEditor.cs
rename to src/Tizen.NUI/src/public/UIComponents/TextEditor.cs
index bad5e3f..513cc6f 100755 (executable)
--- a/src/Tizen.NUI/src/public/TextEditor.cs
+++ b/src/Tizen.NUI/src/public/UIComponents/TextEditor.cs
@@ -24,7 +24,7 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI
+namespace Tizen.NUI.UIComponents
 {
 
     using System;
@@ -139,7 +139,7 @@ namespace Tizen.NUI
             TextChangedEventArgs e = new TextChangedEventArgs();
 
             // Populate all members of "e" (TextChangedEventArgs) with real data
-            e.TextEditor = Tizen.NUI.TextEditor.GetTextEditorFromPtr(textEditor);
+            e.TextEditor = Tizen.NUI.UIComponents.TextEditor.GetTextEditorFromPtr(textEditor);
 
             if (_textEditorTextChangedEventHandler != null)
             {

diff --git a/src/Tizen.NUI/src/public/TextField.cs b/src/Tizen.NUI/src/public/UIComponents/TextField.cs
similarity index 99%
rename from src/Tizen.NUI/src/public/TextField.cs
rename to src/Tizen.NUI/src/public/UIComponents/TextField.cs
index c8e4dba..6cd9ed3 100755 (executable)
--- a/src/Tizen.NUI/src/public/TextField.cs
+++ b/src/Tizen.NUI/src/public/UIComponents/TextField.cs
@@ -24,7 +24,7 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI
+namespace Tizen.NUI.UIComponents
 {
 
     using System;
@@ -165,7 +165,7 @@ namespace Tizen.NUI
             TextChangedEventArgs e = new TextChangedEventArgs();
 
             // Populate all members of "e" (TextChangedEventArgs) with real data
-            e.TextField = Tizen.NUI.TextField.GetTextFieldFromPtr(textField);
+            e.TextField = Tizen.NUI.UIComponents.TextField.GetTextFieldFromPtr(textField);
 
             if (_textFieldTextChangedEventHandler != null)
             {
@@ -204,7 +204,7 @@ namespace Tizen.NUI
             MaxLengthReachedEventArgs e = new MaxLengthReachedEventArgs();
 
             // Populate all members of "e" (MaxLengthReachedEventArgs) with real data
-            e.TextField = Tizen.NUI.TextField.GetTextFieldFromPtr(textField);
+            e.TextField = Tizen.NUI.UIComponents.TextField.GetTextFieldFromPtr(textField);
 
             if (_textFieldMaxLengthReachedEventHandler != null)
             {

diff --git a/src/Tizen.NUI/src/public/TextLabel.cs b/src/Tizen.NUI/src/public/UIComponents/TextLabel.cs
similarity index 99%
rename from src/Tizen.NUI/src/public/TextLabel.cs
rename to src/Tizen.NUI/src/public/UIComponents/TextLabel.cs
index 834fbe0..2bfbb02 100755 (executable)
--- a/src/Tizen.NUI/src/public/TextLabel.cs
+++ b/src/Tizen.NUI/src/public/UIComponents/TextLabel.cs
@@ -24,7 +24,7 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI
+namespace Tizen.NUI.UIComponents
 {
 
     /// <summary>

diff --git a/src/Tizen.NUI/src/public/VisualMaps.cs b/src/Tizen.NUI/src/public/VisualMaps.cs
index e3b35b6..20d467b 100755 (executable)
--- a/src/Tizen.NUI/src/public/VisualMaps.cs
+++ b/src/Tizen.NUI/src/public/VisualMaps.cs
@@ -17,6 +17,7 @@ namespace Tizen.NUI
 {
     using System;
     using System.Runtime.InteropServices;
+    using Tizen.NUI.UIComponents;
 
     /// <summary>
     /// A class encapsulating the transform map of visual.