[NUI] Sync dalihub and Samsung TizenFX (#349)
authordongsug-song <35130733+dongsug-song@users.noreply.github.com>
Wed, 25 Jul 2018 04:07:49 +0000 (13:07 +0900)
committerGitHub <noreply@github.com>
Wed, 25 Jul 2018 04:07:49 +0000 (13:07 +0900)
* Added LayoutGroup and LayoutItem classes in NUI.

This was done by using bindings wrapper classes for LayoutItem,
LayoutGroup, LayoutMeasureSpec, LayoutLength, and LayoutMeasuredSize.

Change-Id: I19e28bdff59a62cf1c8e8711f50f9f0e8f1c119a

* Layouting support in NUI

Change-Id: I3d6f688d869faa81c34385db37feceb1d8c1d0c0

* Fixed disposed bug and removed RegisterChildProperties API usage.

Change-Id: I7b71bd1a3a03306897abdf3c263c6bbb65c1bff8

* RootLayout added to Window

Change-Id: Ie47ceec452b5f254950263bdaf661e9e3fe86d1f

* All Layers have an Absolute layout

Change-Id: I08281a25b2b73822b45f5c6a567b574b5af74fb4

* Set View.Size2D sets layout minimum size if exists.

Change-Id: Ide73c78957d9ee5d4799bfff4aa2232b87ffa536

* [NUI] Minimize public api for xaml

Change-Id: Ib1426b1956a2af307bd6128d6b97067b0d732847

* Renaming of rootlayer in Layer.cs

Change-Id: I583f49caaad819cabaca83b09c9c7dd9c2b9a331

* Fix NUI nested layout issue

Change-Id: I68edd6cf8295e06a52655d84b8ce039a4e1f1008

* [NUI] Back-sync Samsung/TizenFX into dalihub/TizenFX

Change-Id: Ib63e792bc3474c9226506f30889994219e237ec1

* [NUI] Remove tabs and redundant spaces

Change-Id: I1d512d7f478e532f76629b2529995386820fc764

* Sync dalihub/TizenFX and Samsung/TizenFX

- [NUI] Remove apis which are using internal APIs (#324)
  Some apis are using DALi internal APIs.
  Clean up these wrong apis to prevent future errors.
Signed-off-by: minho.sun <minho.sun@samsung.com>
Change-Id: I77f773ec84f93f69684c2bdad26d9721f8ed705d
Signed-off-by: dongsug.song <dongsug.song@samsung.com>
* Sync dalihub/TizenFX and Samsung/TizenFX for NUI-XAML related changes

Change-Id: Ied6a4e33d462712672e65763572c6aa88065a897
Signed-off-by: dongsug.song <dongsug.song@samsung.com>
* Support multi-cascade property setting for Size2D and Position2D

Change-Id: Ibeb9e9ec639742b78054fe8592167170ea0f00d2
Signed-off-by: dongsug.song <dongsug.song@samsung.com>
* Add Mouse button type to identify clicked button kind

Change-Id: Id336dacccff8192a17cda552ba8ea2ba01121002
Signed-off-by: dongsug.song <dongsug.song@samsung.com>
* [NUI] Fix dereferenced error

Value trans, which has null value,
is dereferenced in member access expression trans.Name

Change-Id: I5b7fa2a0e96689ff0cc0821f2e931ed3c4001e9d
Signed-off-by: huiyu.eun <huiyu.eun@samsung.com>
* [NUI]Remove ContentProperty attribute and update sample

Change-Id: I0fbb60bf00c609779b6f5ff4d8aff58a26a8819e

* [NUI] Fix children count of LayoutGroup bug

Change-Id: I73c3b597b161a2dbf4a52d37e6f5a0ab4858c11b
Signed-off-by: huiyu.eun <huiyu.eun@samsung.com>
* [NUI] Make Layout APIs as internal ones (will be changed as public APIs later)

Conflicts:
src/Tizen.NUI/src/internal/Layouting/LayoutGroupWrapper.cs
src/Tizen.NUI/src/internal/Layouting/LayoutItemWrapper.cs

Change-Id: Ia64e9216d10ecc986e0e977f2e0633a03813faec
Signed-off-by: dongsug.song <dongsug.song@samsung.com>
64 files changed:
src/Tizen.NUI/src/internal/FriendAssembly.cs
src/Tizen.NUI/src/internal/Layouting/AbsoluteLayout.cs
src/Tizen.NUI/src/internal/Layouting/FlexLayout.cs
src/Tizen.NUI/src/internal/Layouting/LayoutGroup.cs [changed mode: 0644->0755]
src/Tizen.NUI/src/internal/Layouting/LayoutGroupWrapper.cs [changed mode: 0644->0755]
src/Tizen.NUI/src/internal/Layouting/LayoutItem.cs [changed mode: 0644->0755]
src/Tizen.NUI/src/internal/Layouting/LayoutItemWrapper.cs [changed mode: 0644->0755]
src/Tizen.NUI/src/internal/Layouting/LayoutLength.cs [changed mode: 0644->0755]
src/Tizen.NUI/src/internal/Layouting/LayoutMeasureSpec.cs [changed mode: 0644->0755]
src/Tizen.NUI/src/internal/Layouting/LayoutSize.cs [changed mode: 0644->0755]
src/Tizen.NUI/src/internal/Layouting/LinearLayout.cs
src/Tizen.NUI/src/internal/Layouting/MeasuredSize.cs [changed mode: 0644->0755]
src/Tizen.NUI/src/public/BaseComponents/ImageView.cs
src/Tizen.NUI/src/public/BaseComponents/TextEditor.cs
src/Tizen.NUI/src/public/BaseComponents/TextField.cs
src/Tizen.NUI/src/public/BaseComponents/TextLabel.cs
src/Tizen.NUI/src/public/BaseComponents/VideoView.cs
src/Tizen.NUI/src/public/BaseComponents/View.cs
src/Tizen.NUI/src/public/UIComponents/Button.cs
src/Tizen.NUI/src/public/XamlBinding/ContentPage.cs
test/NUITestSample/NUIXAMLTestSample/TestAmbient/AmbientDuoPage.xaml [deleted file]
test/NUITestSample/NUIXAMLTestSample/TestAmbient/AmbientDuoPage.xaml.cs
test/NUITestSample/NUIXAMLTestSample/TestAmbient/AmbientMonoPage.xaml [deleted file]
test/NUITestSample/NUIXAMLTestSample/TestAmbient/AmbientMonoPage.xaml.cs
test/NUITestSample/NUIXAMLTestSample/TestAmbient/AmbientMultiPage.xaml [deleted file]
test/NUITestSample/NUIXAMLTestSample/TestAmbient/AmbientMultiPage.xaml.cs
test/NUITestSample/NUIXAMLTestSample/TestAmbient/AmbientMultiPage2.xaml [deleted file]
test/NUITestSample/NUIXAMLTestSample/TestAmbient/AmbientMultiPage2.xaml.cs
test/NUITestSample/NUIXAMLTestSample/TestAmbient/AmbientMultiPage3.xaml [deleted file]
test/NUITestSample/NUIXAMLTestSample/TestAmbient/AmbientMultiPage3.xaml.cs
test/NUITestSample/NUIXAMLTestSample/TestAmbient/AmbientScreenUXControl.cs
test/NUITestSample/NUIXAMLTestSample/TestAmbient/BixbyFinancePage.xaml.cs
test/NUITestSample/NUIXAMLTestSample/TestAmbient/BixbyWidgetPage.xaml [deleted file]
test/NUITestSample/NUIXAMLTestSample/TestAmbient/BixbyWidgetPage.xaml.cs
test/NUITestSample/NUIXAMLTestSample/TestAmbient/Finance.cs
test/NUITestSample/NUIXAMLTestSample/TestAmbient/OOBE.cs
test/NUITestSample/NUIXAMLTestSample/TestAmbient/SearchPage.xaml [deleted file]
test/NUITestSample/NUIXAMLTestSample/TestAmbient/SearchPage.xaml.cs
test/NUITestSample/NUIXAMLTestSample/TestAmbient/WeatherPage.xaml [deleted file]
test/NUITestSample/NUIXAMLTestSample/TestAmbient/WeatherPage.xaml.cs
test/NUITestSample/NUIXAMLTestSample/TestDetailApps/AppDetailPage.xaml [deleted file]
test/NUITestSample/NUIXAMLTestSample/TestDetailApps/AppDetailPage.xaml.cs
test/NUITestSample/NUIXAMLTestSample/TestMyContents/MediaHubPage.xaml.cs
test/NUITestSample/NUIXAMLTestSample/res/layout/1920x1080/AmbientDuoPage.xaml [new file with mode: 0755]
test/NUITestSample/NUIXAMLTestSample/res/layout/1920x1080/AmbientMonoPage.xaml [new file with mode: 0755]
test/NUITestSample/NUIXAMLTestSample/res/layout/1920x1080/AmbientMultiPage.xaml [new file with mode: 0755]
test/NUITestSample/NUIXAMLTestSample/res/layout/1920x1080/AmbientMultiPage2.xaml [new file with mode: 0755]
test/NUITestSample/NUIXAMLTestSample/res/layout/1920x1080/AmbientMultiPage3.xaml [new file with mode: 0755]
test/NUITestSample/NUIXAMLTestSample/res/layout/1920x1080/AppDetailPage.xaml [new file with mode: 0755]
test/NUITestSample/NUIXAMLTestSample/res/layout/1920x1080/BixbyFinancePage.xaml [moved from test/NUITestSample/NUIXAMLTestSample/TestAmbient/BixbyFinancePage.xaml with 65% similarity]
test/NUITestSample/NUIXAMLTestSample/res/layout/1920x1080/BixbyWidgetPage.xaml [new file with mode: 0755]
test/NUITestSample/NUIXAMLTestSample/res/layout/1920x1080/MediaHubPage.xaml [moved from test/NUITestSample/NUIXAMLTestSample/TestMyContents/MediaHubPage.xaml with 65% similarity]
test/NUITestSample/NUIXAMLTestSample/res/layout/1920x1080/SearchPage.xaml [new file with mode: 0755]
test/NUITestSample/NUIXAMLTestSample/res/layout/1920x1080/WeatherPage.xaml [new file with mode: 0755]
test/NUITestSample/NUIXAMLTestSample/res/layout/ButtonTestPage.xaml [moved from test/NUITestSample/NUIXAMLTestSample/UTC/TestButton/ButtonTestPage.xaml with 82% similarity]
test/NUITestSample/NUIXAMLTestSample/res/layout/FlexContainerPage.xaml [moved from test/NUITestSample/NUIXAMLTestSample/UTC/TestFlexContainer/FlexContainerPage.xaml with 93% similarity]
test/NUITestSample/NUIXAMLTestSample/res/layout/ImageTestPage.xaml [moved from test/NUITestSample/NUIXAMLTestSample/UTC/TestImageView/ImageTestPage.xaml with 69% similarity]
test/NUITestSample/NUIXAMLTestSample/res/layout/ScrollBarTestPage.xaml [moved from test/NUITestSample/NUIXAMLTestSample/UTC/TestScrollBar/ScrollBarTestPage.xaml with 86% similarity]
test/NUITestSample/NUIXAMLTestSample/res/layout/SliderTestPage.xaml [moved from test/NUITestSample/NUIXAMLTestSample/UTC/TestSlider/SliderTestPage.xaml with 85% similarity]
test/NUITestSample/NUIXAMLTestSample/res/layout/TableTestPage.xaml [moved from test/NUITestSample/NUIXAMLTestSample/UTC/TestTableView/TableTestPage.xaml with 92% similarity]
test/NUITestSample/NUIXAMLTestSample/res/layout/TempPage.xaml [moved from test/NUITestSample/NUIXAMLTestSample/TempTest/TempPage.xaml with 100% similarity]
test/NUITestSample/NUIXAMLTestSample/res/layout/TextEditorTestPage.xaml [moved from test/NUITestSample/NUIXAMLTestSample/UTC/TestTextEditor/TextEditorTestPage.xaml with 92% similarity]
test/NUITestSample/NUIXAMLTestSample/res/layout/TextFieldTestPage.xaml [moved from test/NUITestSample/NUIXAMLTestSample/UTC/TestTextField/TextFieldTestPage.xaml with 94% similarity]
test/NUITestSample/NUIXAMLTestSample/res/layout/TextLabelTestPage.xaml [moved from test/NUITestSample/NUIXAMLTestSample/UTC/TestTextLabel/TextLabelTestPage.xaml with 85% similarity]

index d59733d..b531205 100755 (executable)
@@ -24,6 +24,10 @@ using System.Runtime.CompilerServices;
 [assembly: InternalsVisibleTo("Tizen.TV.NUI, PublicKey=0024000004800000940000000602000000240000525341310004000001000100ed445c2a988d35b99e5766f42eef33d89d1f67225db051f011abcfce47a4788875c39750a2e5695f1ec117f41d96610419811762669f98131db30a6e64c6bb8fde3731f373f6cda4c0087d121f5108559f216dc015807dc46ec5a4d1b63f5deff64c01754a0db0dc849bc300672572cbd2697432ab6c193ebf9fade6bf0f2aad")]
 [assembly: InternalsVisibleTo("Tizen.NUI.Wearable, PublicKey=0024000004800000940000000602000000240000525341310004000001000100d115b1004248416b12d21b626cfb17149c9303fe394693fd3b32d7872e89559a4fa96c98110c2e62eea48aca693bddbe17094ca8ea2e2cd79970ca590fb672b9b371b5d7002076817321f62d6483ea50c56dbd1f37b185a4c24c47718876e6ae6d266508c551170d4cbdda3f82edaff9405ee3d7857282d8269e8e518d2f0fb2")]
 
+//This is for Layout development and test. snk file will be shared internally. This will be removed at 2018-09-30.
+[assembly: InternalsVisibleTo("Tizen.TV.NUI.Example, PublicKey=0024000004800000940000000602000000240000525341310004000001000100a5bcf6fb6095141fa8146ec74d5b0be8b09a063f8f1f32604b10df6e498788182840bd15c93ba1a5c0b9aeee8fe2be42ea9c0b5fe32e1d6d5602b2a4fa813114fd58c4b2910d93e5181b90925458b4b8b003c30d97830a17ad90a92f34f60a11f67a78757e6b2035e799be5ab69a41ede17cad2e2b7967fbf49b685452496be0")]
+[assembly: InternalsVisibleTo("NuiSample, PublicKey=0024000004800000940000000602000000240000525341310004000001000100a5bcf6fb6095141fa8146ec74d5b0be8b09a063f8f1f32604b10df6e498788182840bd15c93ba1a5c0b9aeee8fe2be42ea9c0b5fe32e1d6d5602b2a4fa813114fd58c4b2910d93e5181b90925458b4b8b003c30d97830a17ad90a92f34f60a11f67a78757e6b2035e799be5ab69a41ede17cad2e2b7967fbf49b685452496be0")]
+
 namespace Tizen.NUI
 {
 }
index d4a84da..174a4c6 100755 (executable)
@@ -17,9 +17,11 @@ using System.ComponentModel;
 
 namespace Tizen.NUI
 {
-    /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    public class AbsoluteLayout : LayoutGroupWrapper
+    /// <summary>
+    /// [Draft] This class implements a absolute layout, allowing explict positioning of children.
+    ///  Positions are from the top left of the layout and can be set using the Actor::Property::POSITION and alike.
+    /// </summary>
+    internal class AbsoluteLayout : LayoutGroupWrapper
     {
         private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
@@ -33,8 +35,6 @@ namespace Tizen.NUI
             return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
         }
 
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         protected virtual void Dispose(DisposeTypes type)
         {
             if (disposed)
@@ -65,22 +65,32 @@ namespace Tizen.NUI
             base.Dispose(type);
         }
 
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
+        /// <summary>
+        /// [Draft] Creates a AbsoluteLayout object.
+        /// </summary>
         public AbsoluteLayout() : this(LayoutPINVOKE.AbsoluteLayout_New(), true)
         {
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }
 
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public static AbsoluteLayout DownCast(BaseHandle handle)
+        /// <summary>
+        /// [Draft] Downcasts a handle to a AbsoluteLayout handle. 
+        /// If handle points to a AbsoluteLayout, the downcast produces a valid handle. 
+        /// If not, the returned handle is left uninitialized.
+        /// </summary>
+        /// <param name="handle">handle to an object</param>
+        /// <returns>Handle to a AbsoluteLayout or an uninitialized handle</returns>
+        internal static AbsoluteLayout DownCast(BaseHandle handle)
         {
             AbsoluteLayout ret = new AbsoluteLayout(LayoutPINVOKE.AbsoluteLayout_DownCast(BaseHandle.getCPtr(handle)), true);
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             return ret;
         }
 
+        /// <summary>
+        /// [Draft] Copy constructor
+        /// </summary>
+        /// <param name="other"></param>
         internal AbsoluteLayout(AbsoluteLayout other) : this(LayoutPINVOKE.new_AbsoluteLayout__SWIG_1(AbsoluteLayout.getCPtr(other)), true)
         {
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
index 9ab4035..904c237 100755 (executable)
@@ -17,9 +17,13 @@ using System.ComponentModel;
 
 namespace Tizen.NUI
 {
-    /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    public class FlexLayout : LayoutGroupWrapper
+    /// <summary>
+    /// [Draft] This class implements a flex layout.
+    /// The flex layout implementation is based on open source Facebook Yoga layout engine.
+    /// For more information about the flex layout API and how to use it please refer to https://yogalayout.com/docs/
+    /// We implement the subset of the API in the class below.
+    /// </summary>
+    internal class FlexLayout : LayoutGroupWrapper
     {
         private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
@@ -33,9 +37,6 @@ namespace Tizen.NUI
             return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
         }
 
-
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         protected virtual void Dispose(DisposeTypes type)
         {
             if (disposed)
@@ -66,15 +67,15 @@ namespace Tizen.NUI
             base.Dispose(type);
         }
 
-
+        /// <summary>
+        /// [Draft] Creates a FlexLayout object.
+        /// </summary>
         public FlexLayout() : this(LayoutPINVOKE.FlexLayout_New(), true)
         {
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }
 
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public static FlexLayout DownCast(BaseHandle handle)
+        internal static FlexLayout DownCast(BaseHandle handle)
         {
             FlexLayout ret = new FlexLayout(LayoutPINVOKE.FlexLayout_DownCast(BaseHandle.getCPtr(handle)), true);
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
@@ -170,8 +171,10 @@ namespace Tizen.NUI
             internal static readonly int ALIGN_SELF = LayoutPINVOKE.FlexLayout_ChildProperty_ALIGN_SELF_get();
         }
 
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
+        /// <summary>
+        /// [Draft] Get/Set the flex direction in the layout.
+        /// The direction of the main-axis which determines the direction that flex items are laid out.
+        /// </summary>
         public FlexDirection Direction
         {
             get
@@ -184,8 +187,9 @@ namespace Tizen.NUI
             }
         }
 
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
+        /// <summary>
+        /// [Draft] Get/Set the justification in the layout.
+        /// </summary>
         public FlexJustification Justification
         {
             get
@@ -198,8 +202,9 @@ namespace Tizen.NUI
             }
         }
 
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
+        /// <summary>
+        /// [Draft] Get/Set the wrap in the layout.
+        /// </summary>
         public FlexWrapType WrapType
         {
             get
@@ -212,8 +217,9 @@ namespace Tizen.NUI
             }
         }
 
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
+        /// <summary>
+        /// [Draft] Get/Set the alignment of the layout content.
+        /// </summary>
         public AlignmentType Alignment
         {
             get
@@ -226,8 +232,9 @@ namespace Tizen.NUI
             }
         }
 
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
+        /// <summary>
+        /// [Draft] Get/Set the alignment of the layout items.
+        /// </summary>
         public AlignmentType ItemsAlignment
         {
             get
@@ -240,43 +247,96 @@ namespace Tizen.NUI
             }
         }
 
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
+        /// <summary>
+        /// [Draft] Enumeration for the direction of the main axis in the flex container.
+        /// This determines the direction that flex items are laid out in the flex container.
+        /// </summary>
         public enum FlexDirection
         {
+            /// <summary>
+            /// The flexible items are displayed vertically as a column
+            /// </summary>
             Column,
+            /// <summary>
+            /// The flexible items are displayed vertically as a column, but in reverse order
+            /// </summary>
             ColumnReverse,
+            /// <summary>
+            /// The flexible items are displayed horizontally as a row
+            /// </summary>
             Row,
+            /// <summary>
+            /// The flexible items are displayed horizontally as a row, but in reverse order
+            /// </summary>
             RowReverse
         }
 
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
+        /// <summary>
+        /// [Draft] Enumeration for the alignment of the flex items when the items do not use all available space on the main-axis.
+        /// </summary>
         public enum FlexJustification
         {
+            /// <summary>
+            /// Items are positioned at the beginning of the container
+            /// </summary>
             FlexStart,
+            /// <summary>
+            /// Items are positioned at the center of the container
+            /// </summary>
             Center,
+            /// <summary>
+            /// Items are positioned at the end of the container
+            /// </summary>
             FlexEnd,
+            /// <summary>
+            /// Items are positioned with equal space between the lines
+            /// </summary>
             SpaceBetween,
+            /// <summary>
+            /// Items are positioned with equal space before, between, and after the lines
+            /// </summary>
             SpaceAround
         }
 
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
+        /// <summary>
+        /// [Draft] Enumeration for the wrap type of the flex container when there is no enough room for all the items on one flex line.
+        /// </summary>
         public enum FlexWrapType
         {
+            /// <summary>
+            /// Flex items laid out in single line (shrunk to fit the flex container along the main axis)
+            /// </summary>
             NoWrap,
+            /// <summary>
+            /// Flex items laid out in multiple lines if needed
+            /// </summary>
             Wrap
         }
 
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
+        /// <summary>
+        /// [Draft] Enumeration for the alignment of the flex items or lines when the items or lines do not use all the available space on the cross-axis.
+        /// </summary>
         public enum AlignmentType
         {
+            /// <summary>
+            /// Inherits the same alignment from the parent (only valid for "alignSelf" property)
+            /// </summary>
             Auto,
+            /// <summary>
+            /// At the beginning of the container
+            /// </summary>
             FlexStart,
+            /// <summary>
+            /// At the center of the container
+            /// </summary>
             Center,
+            /// <summary>
+            /// At the end of the container
+            /// </summary>
             FlexEnd,
+            /// <summary>
+            /// Stretch to fit the container
+            /// </summary>
             Stretch
         }
     }
old mode 100644 (file)
new mode 100755 (executable)
index 6145ef1..1d85b99
@@ -21,14 +21,10 @@ using Tizen.NUI.BaseComponents;
 namespace Tizen.NUI
 {
     /// <summary>
-    /// LayoutGroup class providing container functionality.
+    /// [Draft] LayoutGroup class providing container functionality.
     /// </summary>
-    /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    public class LayoutGroup : LayoutGroupWrapper
+    internal class LayoutGroup : LayoutGroupWrapper
     {
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public LayoutGroup() : base(new LayoutGroupWrapperImpl())
         {
             // Initialize delegates of LayoutItem
@@ -49,8 +45,6 @@ namespace Tizen.NUI
         /// <summary>
         /// Remove all layout children.<br />
         /// </summary>
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public void RemoveAll()
         {
             layoutGroupWrapperImpl.RemoveAll();
@@ -75,8 +69,6 @@ namespace Tizen.NUI
         /// <param name="padding">The padding of this view for the current dimension and margins, if applicable.</param>
         /// <param name="childDimension"> How big the child wants to be in the current dimension.</param>
         /// <returns>a MeasureSpec for the child.</returns>
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public static LayoutMeasureSpec GetChildMeasureSpec(LayoutMeasureSpec measureSpec, LayoutLength padding, LayoutLength childDimension)
         {
             return LayoutGroupWrapperImpl.GetChildMeasureSpec(measureSpec, padding, childDimension);
@@ -90,8 +82,6 @@ namespace Tizen.NUI
         /// </summary>
         /// <param name="widthMeasureSpec">horizontal space requirements as imposed by the parent.</param>
         /// <param name="heightMeasureSpec">vertical space requirements as imposed by the parent.</param>
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         protected virtual void OnMeasure(LayoutMeasureSpec widthMeasureSpec, LayoutMeasureSpec heightMeasureSpec)
         {
             SetMeasuredDimensions(new MeasuredSize(LayoutItemWrapperImpl.GetDefaultSize(layoutItemWrapperImpl.GetSuggestedMinimumWidth(), widthMeasureSpec)),
@@ -107,8 +97,6 @@ namespace Tizen.NUI
         /// <param name="top"> Top position, relative to parent.</param>
         /// <param name="right">Right position, relative to parent.</param>
         /// <param name="bottom">Bottom position, relative to parent.</param>
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         protected virtual void OnLayout(bool changed, LayoutLength left, LayoutLength top, LayoutLength right, LayoutLength bottom)
         {
 
@@ -119,8 +107,6 @@ namespace Tizen.NUI
         /// </summary>
         /// <param name="newSize">The new size of the layout.</param>
         /// <param name="oldSize">The old size of the layout.</param>
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         protected virtual void OnSizeChanged(LayoutSize newSize, LayoutSize oldSize)
         {
 
@@ -146,8 +132,6 @@ namespace Tizen.NUI
         /// <summary>
         /// Second stage initialization method for deriving classes to override.<br />
         /// </summary>
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         protected virtual void DoInitialize()
         {
         }
@@ -156,8 +140,6 @@ namespace Tizen.NUI
         /// Method for derived classes to implement in order to register child property types with the container.<br />
         /// </summary>
         /// <param name="containerType">The fully qualified typename of the container.</param>
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         protected virtual void DoRegisterChildProperties(string containerType)
         {
         }
@@ -169,8 +151,6 @@ namespace Tizen.NUI
         /// </summary>
         /// <param name="widthMeasureSpec">The width requirements for this view.</param>
         /// <param name="heightMeasureSpec">The height requirements for this view.</param>
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         protected virtual void MeasureChildren(LayoutMeasureSpec widthMeasureSpec, LayoutMeasureSpec heightMeasureSpec)
         {
             layoutGroupWrapperImpl.MeasureChildrenNative(widthMeasureSpec, heightMeasureSpec);
@@ -184,8 +164,6 @@ namespace Tizen.NUI
         /// <param name="child">The child to measure.</param>
         /// <param name="parentWidthMeasureSpec">The width requirements for this view.</param>
         /// <param name="parentHeightMeasureSpec">The height requirements for this view.</param>
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         protected virtual void MeasureChild(LayoutItem child, LayoutMeasureSpec parentWidthMeasureSpec, LayoutMeasureSpec parentHeightMeasureSpec)
         {
             layoutGroupWrapperImpl.MeasureChildNative(child, parentWidthMeasureSpec, parentHeightMeasureSpec);
@@ -202,8 +180,6 @@ namespace Tizen.NUI
         /// <param name="widthUsed">Extra space that has been used up by the parent horizontally (possibly by other children of the parent).</param>
         /// <param name="parentHeightMeasureSpec">The height requirements for this view.</param>
         /// <param name="heightUsed">Extra space that has been used up by the parent vertically (possibly by other children of the parent).</param>
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         protected virtual void MeasureChildWithMargins(LayoutItem child, LayoutMeasureSpec parentWidthMeasureSpec, LayoutLength widthUsed, LayoutMeasureSpec parentHeightMeasureSpec, LayoutLength heightUsed)
         {
             layoutGroupWrapperImpl.MeasureChildWithMarginsNative(child, parentWidthMeasureSpec, widthUsed, parentHeightMeasureSpec, heightUsed);
old mode 100644 (file)
new mode 100755 (executable)
index cf4cef1..288723f
  *
  */
 
+using System;
 using System.ComponentModel;
 using Tizen.NUI.BaseComponents;
 
 namespace Tizen.NUI
 {
-    /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    public class LayoutGroupWrapper : LayoutItem//LayoutItemWrapper
+    internal class LayoutGroupWrapper : LayoutItem
     {
         private global::System.Runtime.InteropServices.HandleRef swigCPtr;
         internal LayoutGroupWrapperImpl layoutGroupWrapperImpl;
@@ -37,8 +36,6 @@ namespace Tizen.NUI
             return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
         }
 
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         protected override void Dispose(DisposeTypes type)
         {
             if (disposed)
@@ -71,78 +68,57 @@ namespace Tizen.NUI
             base.Dispose(type);
         }
 
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public class ChildProperty
         {
             public static readonly int MARGIN_SPECIFICATION = LayoutPINVOKE.LayoutGroupWrapper_ChildProperty_MARGIN_SPECIFICATION_get();
         }
 
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public LayoutGroupWrapper() : this(LayoutPINVOKE.new_LayoutGroupWrapper__SWIG_0(), true)
         {
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }
 
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public LayoutGroupWrapper(LayoutGroupWrapper copy) : this(LayoutPINVOKE.new_LayoutGroupWrapper__SWIG_1(LayoutGroupWrapper.getCPtr(copy)), true)
         {
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }
 
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public uint Add(LayoutItemWrapper childLayout)
         {
             uint ret = LayoutPINVOKE.LayoutGroupWrapper_Add(swigCPtr, LayoutItemWrapper.getCPtr(childLayout));
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            LayoutChildren.Add(childLayout);
             return ret;
         }
 
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public void Remove(uint childId)
         {
             LayoutPINVOKE.LayoutGroupWrapper_Remove__SWIG_0(swigCPtr, childId);
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }
 
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public void Remove(LayoutItemWrapper childLayout)
         {
             LayoutPINVOKE.LayoutGroupWrapper_Remove__SWIG_1(swigCPtr, LayoutItemWrapper.getCPtr(childLayout));
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            LayoutChildren.Remove(childLayout);
         }
 
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public LayoutItem GetChildAt(uint index)
         {
-            global::System.IntPtr cPtr = LayoutPINVOKE.LayoutGroupWrapper_GetChildAt(swigCPtr, index);
-
-
-            global::System.Runtime.InteropServices.HandleRef CPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-            BaseHandle basehandle = Registry.GetManagedBaseHandleFromNativePtr(CPtr.Handle);
-            NDalicPINVOKE.delete_BaseHandle(CPtr);
-            CPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-
-            return basehandle as LayoutItem;
+            if(index >= 0 && index < LayoutChildren.Count)
+            {
+                LayoutItem layoutItem = LayoutChildren[Convert.ToInt32(index)] as LayoutItem;
+                return layoutItem;
+            }
+            return null;
         }
 
         private uint GetChildCount()
         {
-            uint ret = LayoutPINVOKE.LayoutGroupWrapper_GetChildCount(swigCPtr);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
+            return Convert.ToUInt32(LayoutChildren.Count);
         }
 
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public uint ChildCount
         {
             get
@@ -151,8 +127,6 @@ namespace Tizen.NUI
             }
         }
 
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public LayoutItemWrapper GetChild(uint childId)
         {
             LayoutItemWrapper ret = new LayoutItemWrapper(LayoutPINVOKE.LayoutGroupWrapper_GetChild(swigCPtr, childId), true);
@@ -166,8 +140,6 @@ namespace Tizen.NUI
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }
 
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public static readonly uint UNKNOWN_ID = LayoutPINVOKE.LayoutGroupWrapper_UNKNOWN_ID_get();
     }
-}
\ No newline at end of file
+}
old mode 100644 (file)
new mode 100755 (executable)
index 4fbdaf4..4d8f1aa
@@ -20,16 +20,16 @@ using Tizen.NUI.BaseComponents;
 
 namespace Tizen.NUI
 {
-    /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    public class LayoutItem : LayoutItemWrapper
+    /// <summary>
+    /// [Draft] Base class for layouts. It is used to layout a control (or visual).
+    /// It can be laid out by a LayoutGroup.
+    /// </summary>
+    internal class LayoutItem : LayoutItemWrapper
     {
         internal LayoutItem(global::System.IntPtr cPtr, bool cMemoryOwn) : base(cPtr, cMemoryOwn)
         {
         }
 
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public LayoutItem() : base(new LayoutItemWrapperImpl())
         {
             LayoutItemInitialize(layoutItemWrapperImpl);
@@ -47,15 +47,11 @@ namespace Tizen.NUI
         /// <summary>
         /// Unparent this layout from it's owner, and remove any layout children in derived types. <br />
         /// </summary>
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public void Unparent()
         {
             layoutItemWrapperImpl.Unparent();
         }
 
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         protected void SetMeasuredDimensions(MeasuredSize measuredWidth, MeasuredSize measuredHeight)
         {
             layoutItemWrapperImpl.SetMeasuredDimensions(measuredWidth, measuredHeight);
@@ -84,8 +80,6 @@ namespace Tizen.NUI
         /// <param name="top">Top position, relative to parent.</param>
         /// <param name="right">Right position, relative to parent.</param>
         /// <param name="bottom">Bottom position, relative to parent.</param>
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public void Layout(LayoutLength left, LayoutLength top, LayoutLength right, LayoutLength bottom)
         {
             layoutItemWrapperImpl.Layout(left, top, right, bottom);
@@ -99,15 +93,11 @@ namespace Tizen.NUI
         /// <param name="size"> Default size for this layout.</param>
         /// <param name="measureSpec"> Constraints imposed by the parent.</param>
         /// <returns>The size this layout should be.</returns>
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public static LayoutLength GetDefaultSize(LayoutLength size, LayoutMeasureSpec measureSpec)
         {
             return LayoutItemWrapperImpl.GetDefaultSize(size, measureSpec);
         }
 
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public ILayoutParent GetParent
         {
             get
@@ -120,8 +110,6 @@ namespace Tizen.NUI
         /// Request that this layout is re-laid out.<br />
         /// This will make this layout and all it's parent layouts dirty.<br />
         /// </summary>
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public void RequestLayout()
         {
             layoutItemWrapperImpl.RequestLayout();
@@ -130,8 +118,6 @@ namespace Tizen.NUI
         /// <summary>
         /// Predicate to determine if this layout has been requested to re-layout.<br />
         /// </summary>
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public bool LayoutRequested
         {
             get
@@ -153,8 +139,6 @@ namespace Tizen.NUI
         /// Get the measured width (without any measurement flags).<br />
         /// This method should be used only during measurement and layout calculations.<br />
         /// </summary>
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public LayoutLength MeasuredWidth
         {
             get
@@ -176,8 +160,6 @@ namespace Tizen.NUI
         /// Get the measured height (without any measurement flags).<br />
         /// This method should be used only during measurement and layout calculations.<br />
         /// </summary>
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public LayoutLength MeasuredHeight
         {
             get
@@ -199,8 +181,6 @@ namespace Tizen.NUI
         /// Get the measured width and state.<br />
         /// This method should be used only during measurement and layout calculations.<br />
         /// </summary>
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public MeasuredSize MeasuredWidthAndState
         {
             get
@@ -222,8 +202,6 @@ namespace Tizen.NUI
         /// Get the measured height and state.<br />
         /// This method should be used only during measurement and layout calculations.<br />
         /// </summary>
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public MeasuredSize MeasuredHeightAndState
         {
             get
@@ -245,8 +223,6 @@ namespace Tizen.NUI
         /// Returns the suggested minimum width that the layout should use.<br />
         /// This returns the maximum of the layout's minimum width and the background's minimum width.<br />
         /// </summary>
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public LayoutLength SuggestedMinimumWidth
         {
             get
@@ -269,8 +245,6 @@ namespace Tizen.NUI
         /// Returns the suggested minimum height that the layout should use.<br />
         /// This returns the maximum of the layout's minimum height and the background's minimum height.<br />
         /// </summary>
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public LayoutLength SuggestedMinimumHeight
         {
             get
@@ -294,8 +268,6 @@ namespace Tizen.NUI
         /// It is not guaranteed the layout will be able to achieve this minimum width (for example, if its parent
         /// layout constrains it with less available width).<br />
         /// </summary>
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public LayoutLength MinimumWidth
         {
             get
@@ -324,8 +296,6 @@ namespace Tizen.NUI
         /// It is not guaranteed the layout will be able to achieve this minimum height (for example, if its parent
         /// layout constrains it with less available height).<br />
         /// </summary>
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public LayoutLength MinimumHeight
         {
             get
@@ -378,8 +348,6 @@ namespace Tizen.NUI
         /// </summary>
         /// <param name="widthMeasureSpec">horizontal space requirements as imposed by the parent.</param>
         /// <param name="heightMeasureSpec">vertical space requirements as imposed by the parent.</param>
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         protected virtual void OnMeasure(LayoutMeasureSpec widthMeasureSpec, LayoutMeasureSpec heightMeasureSpec)
         {
             layoutItemWrapperImpl.OnMeasureNative(widthMeasureSpec, heightMeasureSpec);
@@ -394,8 +362,6 @@ namespace Tizen.NUI
         /// <param name="top">Top position, relative to parent.</param>
         /// <param name="right">Right position, relative to parent.</param>
         /// <param name="bottom">Bottom position, relative to parent.</param>
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         protected virtual void OnLayout(bool changed, LayoutLength left, LayoutLength top, LayoutLength right, LayoutLength bottom)
         {
         }
old mode 100644 (file)
new mode 100755 (executable)
index bc9dd5b..f4ed584
  *
  */
 
+using System.Collections.Generic;
 using System.ComponentModel;
 using Tizen.NUI.BaseComponents;
 
 namespace Tizen.NUI
 {
-    /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    public class LayoutItemWrapper : BaseHandle
+    internal class LayoutItemWrapper : BaseHandle
     {
         private global::System.Runtime.InteropServices.HandleRef swigCPtr;
         internal LayoutItemWrapperImpl layoutItemWrapperImpl;
@@ -37,8 +36,6 @@ namespace Tizen.NUI
             return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
         }
 
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         protected override void Dispose(DisposeTypes type)
         {
             if (disposed)
@@ -71,6 +68,15 @@ namespace Tizen.NUI
             base.Dispose(type);
         }
 
+        private List<LayoutItemWrapper> _childLayouts = new List<LayoutItemWrapper>();
+        internal List<LayoutItemWrapper> LayoutChildren
+        {
+            get
+            {
+                return _childLayouts;
+            }
+        }
+
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
         public class ChildProperty
@@ -85,8 +91,6 @@ namespace Tizen.NUI
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }*/
 
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public View GetOwner()
         {
             global::System.IntPtr cPtr = LayoutPINVOKE.LayoutItemWrapper_GetOwner(swigCPtr);
@@ -108,8 +112,6 @@ namespace Tizen.NUI
             return ret;
         }
 
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public bool LayoutAnimate
         {
             get
@@ -129,10 +131,7 @@ namespace Tizen.NUI
         }
     }
 
-
-    /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    public interface ILayoutParent
+    internal interface ILayoutParent
     {
         ILayoutParent GetParent();
         /*{
@@ -142,4 +141,4 @@ namespace Tizen.NUI
             return ret;
         }*/
     }
-}
\ No newline at end of file
+}
old mode 100644 (file)
new mode 100755 (executable)
index 3dce4fd..0712ac1
@@ -20,9 +20,10 @@ using Tizen.NUI.BaseComponents;
 
 namespace Tizen.NUI
 {
-    /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    public class LayoutLength : global::System.IDisposable
+    /// <summary>
+    /// [Draft] A type that represents a layout length. Currently, this implies pixels, but could be extended to handle device dependant sizes, etc.
+    /// </summary>
+    internal class LayoutLength : global::System.IDisposable
     {
         private global::System.Runtime.InteropServices.HandleRef swigCPtr;
         protected bool swigCMemOwn;
@@ -43,8 +44,6 @@ namespace Tizen.NUI
             Dispose();
         }
 
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public virtual void Dispose()
         {
             lock (this)
@@ -62,15 +61,11 @@ namespace Tizen.NUI
             }
         }
 
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public LayoutLength(int value) : this(LayoutPINVOKE.new_LayoutLength__SWIG_0(value), true)
         {
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }
 
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public LayoutLength(LayoutLength layoutLength) : this(LayoutPINVOKE.new_LayoutLength__SWIG_1(LayoutLength.getCPtr(layoutLength)), true)
         {
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
@@ -82,8 +77,6 @@ namespace Tizen.NUI
         /// <param name="arg1">The first value.</param>
         /// <param name="arg2">The second value.</param>
         /// <returns>The LayoutLength containing the result of the addition.</returns>
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public static LayoutLength operator +(LayoutLength arg1, LayoutLength arg2)
         {
             return arg1.Add(arg2);
@@ -95,8 +88,6 @@ namespace Tizen.NUI
         /// <param name="arg1">The first value.</param>
         /// <param name="arg2">The second value.</param>
         /// <returns>The LayoutLength containing the result of the addition.</returns>
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public static LayoutLength operator +(LayoutLength arg1, int arg2)
         {
             return arg1.Add(arg2);
@@ -108,8 +99,6 @@ namespace Tizen.NUI
         /// <param name="arg1">The first value.</param>
         /// <param name="arg2">The second value.</param>
         /// <returns>The LayoutLength containing the result of the subtraction.</returns>
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public static LayoutLength operator -(LayoutLength arg1, LayoutLength arg2)
         {
             return arg1.Subtract(arg2);
@@ -121,8 +110,6 @@ namespace Tizen.NUI
         /// <param name="arg1">The first value.</param>
         /// <param name="arg2">The second value.</param>
         /// <returns>The LayoutLength containing the result of the subtraction.</returns>
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public static LayoutLength operator -(LayoutLength arg1, int arg2)
         {
             return arg1.Subtract(arg2);
@@ -134,8 +121,6 @@ namespace Tizen.NUI
         /// <param name="arg1">The first value.</param>
         /// <param name="arg2">The second value.</param>
         /// <returns>The LayoutLength containing the result of the multiplication.</returns>
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public static LayoutLength operator *(LayoutLength arg1, LayoutLength arg2)
         {
             return arg1.Multiply(arg2);
@@ -147,8 +132,6 @@ namespace Tizen.NUI
         /// <param name="arg1">The first value.</param>
         /// <param name="arg2">The int value to scale the LayoutLength.</param>
         /// <returns>The LayoutLength containing the result of the scaling.</returns>
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public static LayoutLength operator *(LayoutLength arg1, int arg2)
         {
             return arg1.Multiply(arg2);
@@ -160,8 +143,6 @@ namespace Tizen.NUI
         /// <param name="arg1">The first value.</param>
         /// <param name="arg2">The second value.</param>
         /// <returns>The LayoutLength containing the result of the division.</returns>
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public static LayoutLength operator /(LayoutLength arg1, LayoutLength arg2)
         {
             return arg1.Divide(arg2);
@@ -173,22 +154,16 @@ namespace Tizen.NUI
         /// <param name="arg1">The first value.</param>
         /// <param name="arg2">The int value to scale the vector by.</param>
         /// <returns>The LayoutLength containing the result of the scaling.</returns>
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public static LayoutLength operator /(LayoutLength arg1, int arg2)
         {
             return arg1.Divide(arg2);
         }
 
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public static bool operator ==(LayoutLength r1, LayoutLength r2)
         {
             return r1.EqualTo(r2);
         }
 
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public static bool operator !=(LayoutLength r1, LayoutLength r2)
         {
             return !r1.EqualTo(r2);
@@ -320,8 +295,6 @@ namespace Tizen.NUI
             return ret;
         }
 
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public float ConvertToFloat()
         {
             float ret = LayoutPINVOKE.LayoutLength_ConvertToFloat(swigCPtr);
@@ -329,8 +302,6 @@ namespace Tizen.NUI
             return ret;
         }
 
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public int Value
         {
             set
old mode 100644 (file)
new mode 100755 (executable)
index 18cb79f..9b9408a
@@ -20,14 +20,13 @@ using Tizen.NUI.BaseComponents;
 
 namespace Tizen.NUI
 {
-
-    /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    public class LayoutMeasureSpec : global::System.IDisposable
+    /// <summary>
+    /// [Draft] A MeasureSpec is used during the Measure pass by a LayoutGroup to inform it's children how to be measured.
+    /// For instance, it may measure a child with an exact width and an unspecified height in order to determine height for width.
+    /// </summary>
+    internal class LayoutMeasureSpec : global::System.IDisposable
     {
         private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         protected bool swigCMemOwn;
 
         internal LayoutMeasureSpec(global::System.IntPtr cPtr, bool cMemoryOwn)
@@ -41,15 +40,11 @@ namespace Tizen.NUI
             return (obj.Equals(null)) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
         }
 
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         ~LayoutMeasureSpec()
         {
             Dispose();
         }
 
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public virtual void Dispose()
         {
             lock (this)
@@ -66,29 +61,21 @@ namespace Tizen.NUI
             }
         }
 
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public LayoutMeasureSpec(LayoutLength measureSpec, LayoutMeasureSpec.ModeType mode) : this(LayoutPINVOKE.new_MeasureSpec__SWIG_0(LayoutLength.getCPtr(measureSpec), (int)mode), true)
         {
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }
 
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public LayoutMeasureSpec(int measureSpec) : this(LayoutPINVOKE.new_MeasureSpec__SWIG_1(measureSpec), true)
         {
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }
 
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public static bool operator ==(LayoutMeasureSpec r1, LayoutMeasureSpec r2)
         {
             return r1.EqualTo(r2);
         }
 
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public static bool operator !=(LayoutMeasureSpec r1, LayoutMeasureSpec r2)
         {
             return !r1.EqualTo(r2);
@@ -122,8 +109,13 @@ namespace Tizen.NUI
             return ret;
         }
 
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
+        /// <summary>
+        /// [Draft] Adjust the measure size by the given delta. Used only for EXACT and AT_MOST modes.
+        /// if the adjusted size is negative, it is zeroed.
+        /// </summary>
+        /// <param name="measureSpec">the measure spec to adjust</param>
+        /// <param name="delta">A positive or negative value to adjust the measure spec by.</param>
+        /// <returns>A new measure spec with the adjusted values.</returns>
         public static LayoutMeasureSpec Adjust(LayoutMeasureSpec measureSpec, int delta)
         {
             LayoutMeasureSpec ret = new LayoutMeasureSpec(LayoutPINVOKE.MeasureSpec_Adjust(LayoutMeasureSpec.getCPtr(measureSpec), delta), true);
@@ -131,8 +123,6 @@ namespace Tizen.NUI
             return ret;
         }
 
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public int Size
         {
             set
@@ -148,8 +138,6 @@ namespace Tizen.NUI
             }
         }
 
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public LayoutMeasureSpec.ModeType Mode
         {
             set
@@ -165,15 +153,22 @@ namespace Tizen.NUI
             }
         }
 
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public enum ModeType
         {
-            UNSPECIFIED, ///< This is used by a parent to determine the desired dimension of a child layout.
-            EXACTLY,     /** This is used by a parent to impose an exact size on the child. The child must use
-                             this size, and guarantee that all of its descendants will fit within this size. */
-            AT_MOST      /** This is used by the parent to impose a maximum size on the child. The child must guarantee
-                          * that it and all of it's descendants will fit within this size. */
+            /// <summary>
+            /// This is used by a parent to determine the desired dimension of a child layout.
+            /// </summary>
+            Unspecified,
+            /// <summary>
+            /// This is used by a parent to impose an exact size on the child.
+            /// The child must use this size, and guarantee that all of its descendants will fit within this size.
+            /// </summary>
+            Exactly,
+            /// <summary>
+            /// This is used by the parent to impose a maximum size on the child.
+            /// The child must guarantee that it and all of it's descendants will fit within this size.
+            /// </summary>
+            AtMost
         }
     }
 }
old mode 100644 (file)
new mode 100755 (executable)
index 77c1a01..3932361
@@ -20,13 +20,12 @@ using Tizen.NUI.BaseComponents;
 
 namespace Tizen.NUI
 {
-    /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    public class LayoutSize : global::System.IDisposable
+    /// <summary>
+    /// [Draft] This class represents a layout size (width and height)
+    /// </summary>
+    internal class LayoutSize : global::System.IDisposable
     {
         private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         protected bool swigCMemOwn;
 
         internal LayoutSize(global::System.IntPtr cPtr, bool cMemoryOwn)
@@ -40,15 +39,11 @@ namespace Tizen.NUI
             return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
         }
 
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         ~LayoutSize()
         {
             Dispose();
         }
 
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public virtual void Dispose()
         {
             lock(this)
@@ -66,15 +61,11 @@ namespace Tizen.NUI
             }
         }
 
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public LayoutSize() : this(LayoutPINVOKE.new_LayoutSize__SWIG_0(), true)
         {
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }
 
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public LayoutSize(int x, int y) : this(LayoutPINVOKE.new_LayoutSize__SWIG_1(x, y), true)
         {
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
@@ -99,8 +90,6 @@ namespace Tizen.NUI
             return ret;
         }
 
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public bool IsEqualTo(LayoutSize target)
         {
             if (this.Width == target.Width && this.Height == target.Height)
@@ -125,8 +114,6 @@ namespace Tizen.NUI
         //}
 
 
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public int Width
         {
             //This should be blocked! Otherwise, user can set multiple-cascading property setting like "LinearLayout.CellPadding.Width = 100;". This will not be working!
@@ -143,8 +130,6 @@ namespace Tizen.NUI
             }
         }
 
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public int Height
         {
             //This should be blocked! Otherwise, user can set multiple-cascading property setting like "LinearLayout.CellPadding.Height = 100;". This will not be working!
index 792c33a..603bf14 100755 (executable)
@@ -17,9 +17,10 @@ using System.ComponentModel;
 
 namespace Tizen.NUI
 {
-    /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    public class LinearLayout : LayoutGroupWrapper
+    /// <summary>
+    /// [Draft] This class implements a linear box layout, automatically handling right to left or left to right direction change.
+    /// </summary>
+    internal class LinearLayout : LayoutGroupWrapper
     {
         private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
@@ -33,8 +34,6 @@ namespace Tizen.NUI
             return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
         }
 
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         protected override void Dispose(DisposeTypes type)
         {
             if (disposed)
@@ -65,15 +64,11 @@ namespace Tizen.NUI
             base.Dispose(type);
         }
 
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public LinearLayout() : this(LayoutPINVOKE.LinearLayout_New(), true)
         {
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }
 
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public new static LinearLayout DownCast(BaseHandle handle)
         {
             LinearLayout ret = new LinearLayout(LayoutPINVOKE.LinearLayout_DownCast(BaseHandle.getCPtr(handle)), true);
@@ -126,8 +121,9 @@ namespace Tizen.NUI
             CHILD_PROPERTY_END_INDEX = PropertyRanges.CHILD_PROPERTY_REGISTRATION_START_INDEX + 1000
         }
 
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
+        /// <summary>
+        /// [Draft] Get/Set the orientation in the layout
+        /// </summary>
         public LinearLayout.Orientation LinearOrientation
         {
             get
@@ -140,8 +136,9 @@ namespace Tizen.NUI
             }
         }
 
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
+        /// <summary>
+        /// [Draft] Get/Set the padding between cells in the layout
+        /// </summary>
         public LayoutSize CellPadding
         {
             get
@@ -154,11 +151,18 @@ namespace Tizen.NUI
             }
         }
 
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
+        /// <summary>
+        /// [Draft] Enumeration for the direction in which the content is laid out   */
+        /// </summary>
         public enum Orientation
         {
+            /// <summary>
+            /// Horizontal (row)
+            /// </summary>
             Horizontal,
+            /// <summary>
+            /// Vertical (column)
+            /// </summary>
             Vertical
         }
 
old mode 100644 (file)
new mode 100755 (executable)
index 0b8b956..f3bebb0
@@ -20,13 +20,12 @@ using Tizen.NUI.BaseComponents;
 
 namespace Tizen.NUI
 {
-    /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    public class MeasuredSize : global::System.IDisposable
+    /// <summary>
+    /// [Draft] Class that encodes a measurement and a measure state, which is set if the measured size is too small.
+    /// </summary>
+    internal class MeasuredSize : global::System.IDisposable
     {
         private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         protected bool swigCMemOwn;
 
         internal MeasuredSize(global::System.IntPtr cPtr, bool cMemoryOwn)
@@ -45,17 +44,11 @@ namespace Tizen.NUI
         /// <summary>
         /// A Flat to check if it is already disposed.
         /// </summary>
-        /// <since_tizen> 3 </since_tizen>
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         protected bool disposed = false;
 
         /// <summary>
         /// Dispose.
         /// </summary>
-        /// <since_tizen> 3 </since_tizen>
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         ~MeasuredSize()
         {
             if (!isDisposeQueued)
@@ -68,9 +61,6 @@ namespace Tizen.NUI
         /// <summary>
         /// Dispose.
         /// </summary>
-        /// <since_tizen> 3 </since_tizen>
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public void Dispose()
         {
             //Throw excpetion if Dispose() is called in separate thread.
@@ -93,9 +83,6 @@ namespace Tizen.NUI
         /// <summary>
         /// Dispose.
         /// </summary>
-        /// <since_tizen> 3 </since_tizen>
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         protected virtual void Dispose(DisposeTypes type)
         {
             if (disposed)
@@ -126,22 +113,16 @@ namespace Tizen.NUI
             disposed = true;
         }
 
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public MeasuredSize() : this(LayoutPINVOKE.new_MeasuredSize__SWIG_0(), true)
         {
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }
 
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public MeasuredSize(LayoutLength measuredSize) : this(LayoutPINVOKE.new_MeasuredSize__SWIG_1(LayoutLength.getCPtr(measuredSize)), true)
         {
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }
 
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public MeasuredSize(LayoutLength measuredSize, MeasuredSize.StateType state) : this(LayoutPINVOKE.new_MeasuredSize__SWIG_2(LayoutLength.getCPtr(measuredSize), (int)state), true)
         {
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
@@ -161,22 +142,16 @@ namespace Tizen.NUI
             return ret;
         }
 
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public static bool operator ==(MeasuredSize r1, MeasuredSize r2)
         {
             return r1.EqualTo(r2);
         }
 
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public static bool operator !=(MeasuredSize r1, MeasuredSize r2)
         {
             return r1.NotEqualTo(r2);
         }
 
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public MeasuredSize.StateType State
         {
             get
@@ -202,8 +177,6 @@ namespace Tizen.NUI
             return ret;
         }
 
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public LayoutLength Size
         {
             get
@@ -229,12 +202,16 @@ namespace Tizen.NUI
             return ret;
         }
 
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
         public enum StateType
         {
-            MEASURED_SIZE_OK,
-            MEASURED_SIZE_TOO_SMALL
+            /// <summary>
+            /// The measured size is good
+            /// </summary>
+            MeasuredSizeOK,
+            /// <summary>
+            /// The measured size is too small
+            /// </summary>
+            MeasuredSizeTooSmall
         }
     }
 }
index 82030a5..086b5cb 100755 (executable)
@@ -27,7 +27,6 @@ namespace Tizen.NUI.BaseComponents
     /// An instance of ImageView can be created using a URL or an image instance.<br />
     /// </summary>
     /// <since_tizen> 3 </since_tizen>
-    [ContentProperty("ResourceUrl")]
     public class ImageView : View
     {
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
index 545eb36..bca0c94 100755 (executable)
@@ -30,7 +30,6 @@ namespace Tizen.NUI.BaseComponents
     /// A control which provides a multi-line editable text editor.
     /// </summary>
     /// <since_tizen> 3 </since_tizen>
-    [ContentProperty("Text")]
     public class TextEditor : View
     {
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
index f62a203..06d7543 100755 (executable)
@@ -29,7 +29,6 @@ namespace Tizen.NUI.BaseComponents
     /// A control which provides a single line editable text field.
     /// </summary>
     /// <since_tizen> 3 </since_tizen>
-    [ContentProperty("Text")]
     public class TextField : View
     {
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
index 6d22dde..5c067e0 100755 (executable)
@@ -30,7 +30,6 @@ namespace Tizen.NUI.BaseComponents
     /// Text labels are lightweight, non-editable, and do not respond to the user input.<br />
     /// </summary>
     /// <since_tizen> 3 </since_tizen>
-    [ContentProperty("Text")]
     public class TextLabel : View
     {
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
index c2e8004..544a5a9 100755 (executable)
@@ -25,7 +25,6 @@ namespace Tizen.NUI.BaseComponents
     /// VideoView is a control for video playback and display.
     /// </summary>
     /// <since_tizen> 3 </since_tizen>
-    [ContentProperty("ResourceUrl")]
     public class VideoView : View
     {
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
@@ -456,4 +455,4 @@ namespace Tizen.NUI.BaseComponents
 
     }
 
-}
\ No newline at end of file
+}
index 97636f2..ba9bd33 100755 (executable)
@@ -1295,6 +1295,11 @@ namespace Tizen.NUI.BaseComponents
                     child.Layout = layoutItem;
                 }
 
+                if (Layout)
+                {
+                    Layout.LayoutChildren.Add(child.Layout);
+                }
+
                 NDalicPINVOKE.Actor_Add(swigCPtr, View.getCPtr(child));
                 if (NDalicPINVOKE.SWIGPendingException.Pending)
                     throw NDalicPINVOKE.SWIGPendingException.Retrieve();
@@ -1347,6 +1352,13 @@ namespace Tizen.NUI.BaseComponents
                 throw NDalicPINVOKE.SWIGPendingException.Retrieve();
 
             Children.Remove(child);
+            if (Layout)
+            {
+                if(child.Layout)
+                {
+                    Layout.LayoutChildren.Remove(child.Layout);
+                }
+            }
 
             if (ChildRemoved != null)
             {
@@ -3418,10 +3430,7 @@ namespace Tizen.NUI.BaseComponents
         /// </summary>
         /// <remarks>
         /// </remarks>
-        /// <since_tizen> 5 </since_tizen>
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public LayoutItem Layout
+        internal LayoutItem Layout
         {
             get
             {
@@ -3439,6 +3448,11 @@ namespace Tizen.NUI.BaseComponents
             set
             {
                 Tizen.NUI.NDalicManualPINVOKE.SetLayout__SWIG_1(View.getCPtr(this), LayoutItem.getCPtr(value));
+                value.LayoutChildren.Clear();
+                foreach (View view in Children)
+                {
+                    value.LayoutChildren.Add(view.Layout);
+                }
             }
         }
 
@@ -5398,9 +5412,10 @@ namespace Tizen.NUI.BaseComponents
 
         internal readonly MergedStyle _mergedStyle;
 
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public int WidthSpecificationFixed
+        /// <summary>
+        /// Child property to specify desired width
+        /// </summary>
+        internal int LayoutWidthSpecificationFixed
         {
             get
             {
@@ -5416,10 +5431,11 @@ namespace Tizen.NUI.BaseComponents
                 SetProperty(LayoutItemWrapper.ChildProperty.WIDTH_SPECIFICATION, new Tizen.NUI.PropertyValue(value));
             }
         }
-        
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public int HeightSpecificationFixed
+
+        /// <summary>
+        /// Child property to specify desired height
+        /// </summary>
+        internal int LayoutHeightSpecificationFixed
         {
             get
             {
@@ -5435,10 +5451,11 @@ namespace Tizen.NUI.BaseComponents
                 SetProperty(LayoutItemWrapper.ChildProperty.HEIGHT_SPECIFICATION, new Tizen.NUI.PropertyValue(value));
             }
         }
-        
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public ChildLayoutData WidthSpecification
+
+        /// <summary>
+        /// Child property to specify desired width, use MatchParent/WrapContent)
+        /// </summary>
+        internal ChildLayoutData LayoutWidthSpecification
         {
             get
             {
@@ -5454,10 +5471,11 @@ namespace Tizen.NUI.BaseComponents
                 SetProperty(LayoutItemWrapper.ChildProperty.WIDTH_SPECIFICATION, new Tizen.NUI.PropertyValue((int)value));
             }
         }
-        
-        /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public ChildLayoutData HeightSpecification
+
+        /// <summary>
+        /// Child property to specify desired height, use MatchParent/WrapContent)
+        /// </summary>
+        internal ChildLayoutData LayoutHeightSpecification
         {
             get
             {
@@ -5474,12 +5492,8 @@ namespace Tizen.NUI.BaseComponents
             }
         }
 
-
     }
 
-
-
-
     /// <summary>
     /// The View layout Direction type.
     /// </summary>
@@ -5498,11 +5512,15 @@ namespace Tizen.NUI.BaseComponents
         RTL
     }
 
-    /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    public enum ChildLayoutData
+    internal enum ChildLayoutData
     {
+        /// <summary>
+        /// Constant which indicates child size should match parent size
+        /// </summary>
         MatchParent = -1,
+        /// <summary>
+        /// Constant which indicates parent should take the smallest size possible to wrap it's children with their desired size
+        /// </summary>
         WrapContent = -2,
     }
 
index e9c4b04..c286f8a 100755 (executable)
@@ -36,7 +36,6 @@ namespace Tizen.NUI.UIComponents
     /// When the button is disabled, the background button and the selected visuals are replaced by their disabled visuals.<br />
     /// </summary>
     /// <since_tizen> 3 </since_tizen>
-    [ContentProperty("LabelText")]
     public class Button : View
     {
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
index 3a31e72..3c2647a 100755 (executable)
@@ -269,8 +269,10 @@ namespace Tizen.NUI
                 {
                     trans = Extensions.LoadTransition(likelyResourcePath);
                 }
-
-                transDictionary.Add(trans.Name, trans);
+                if (trans)
+                {
+                    transDictionary.Add(trans.Name, trans);
+                }
             }
         }
 
diff --git a/test/NUITestSample/NUIXAMLTestSample/TestAmbient/AmbientDuoPage.xaml b/test/NUITestSample/NUIXAMLTestSample/TestAmbient/AmbientDuoPage.xaml
deleted file mode 100755 (executable)
index b964709..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ContentPage x:Class="Tizen.NUI.Examples.AmbientDuoPage"
-  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
-
-  <ImageView Name="photo00" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/ambient/default/picture_d_1.jpg" Position2D="287,260" Size2D="560,560" />
-  <ImageView Name="photo01" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/ambient/default/picture_d_2.jpg" Position2D="1073,260" Size2D="560,560" />
-</ContentPage>
index b36142b..6c246d2 100755 (executable)
@@ -25,9 +25,9 @@ namespace Tizen.NUI.Examples
 
         public AmbientDuoPage(Window win) : base (win)
         {
-            Content.BackgroundImage = "/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/ambient/photoduo_img_bg_01_no9patch.png";
+            Root.BackgroundImage = "/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/ambient/photoduo_img_bg_01_no9patch.png";
             ClearEvent += OnClearEvent;
-            Content.Opacity = 0.0f;
+            Root.Opacity = 0.0f;
         }
 
         /// <summary>
@@ -53,13 +53,13 @@ namespace Tizen.NUI.Examples
         {
             Console.WriteLine("AmbientDuoPage focused.");
             Animation animation = new Animation(2000);
-            animation.AnimateTo(Content, "Opacity", 1.0f);
+            animation.AnimateTo(Root, "Opacity", 1.0f);
             animation.Play();
         }
 
         private void OnClearEvent(object obj, EventArgs e)
         {
-            Content.BackgroundImage = "/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/ambient/photoduo_img_bg_01_no9patch.png";
+            Root.BackgroundImage = "/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/ambient/photoduo_img_bg_01_no9patch.png";
         }
     }
 }
\ No newline at end of file
diff --git a/test/NUITestSample/NUIXAMLTestSample/TestAmbient/AmbientMonoPage.xaml b/test/NUITestSample/NUIXAMLTestSample/TestAmbient/AmbientMonoPage.xaml
deleted file mode 100755 (executable)
index b0a2d19..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ContentPage x:Class="Tizen.NUI.Examples.AmbientMonoPage"
-  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
-
-  <ImageView Name="photo" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/ambient/default/picture_m_1.jpg" Opacity="0" ParentOrigin="Center" PivotPoint="Center" PositionUsesPivotPoint="true" Size2D="1560,720" />
-  
-</ContentPage>
index 849650e..7e51bf6 100755 (executable)
@@ -45,7 +45,7 @@ namespace Tizen.NUI.Examples
         public override void SetFocus()
         {
             Console.WriteLine("AmbientMonoPage focused.");
-            ImageView image = Content.FindChildByName("photo") as ImageView;
+            ImageView image = Root.FindChildByName("photo") as ImageView;
             Animation animation = new Animation(2000);
             animation.AnimateTo(image, "Opacity", 1.0f);
             animation.Play();
diff --git a/test/NUITestSample/NUIXAMLTestSample/TestAmbient/AmbientMultiPage.xaml b/test/NUITestSample/NUIXAMLTestSample/TestAmbient/AmbientMultiPage.xaml
deleted file mode 100755 (executable)
index ec7b96f..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ContentPage x:Class="Tizen.NUI.Examples.AmbientMultiPage"
-  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
-
-  <ImageView Name="photo0" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/ambient/bg_textbox_w.png" Position2D="50,50" Size2D="440,600" />
-  <View Name="num_area" Size2D="440,160" Position2D="50,50">
-    <ImageView Name="photo0" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/ambient/num/num_w_2.png" Position2D="0,0" Size2D="110,160" />
-    <ImageView Name="photo0" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/ambient/num/num_w_0.png" Position2D="110,0" Size2D="110,160" />
-    <ImageView Name="photo0" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/ambient/num/num_w_th.png" Position2D="220,0" Size2D="220,160" />
-  </View>
-  <View Name="mon_area" Size2D="440,194" Position2D="50,210">
-    <ImageView Name="photo0" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/ambient/mon/mon_w_4.png" Position2D="0,0" Size2D="440,194" />
-  </View>
-  <View Name="year_area" Size2D="440,210" Position2D="50,424">
-    <ImageView Name="photo0" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/ambient/year/year_w_2.png" Position2D="0,0" Size2D="110,210" />
-    <ImageView Name="photo0" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/ambient/year/year_w_0.png" Position2D="110,0" Size2D="110,210" />
-    <ImageView Name="photo0" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/ambient/year/year_w_1.png" Position2D="220,0" Size2D="110,210" />
-    <ImageView Name="photo0" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/ambient/year/year_w_8.png" Position2D="330,0" Size2D="110,210" />
-  </View>
-  <ImageView Name="photo1" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/ambient/default/picture_01.jpg" Position2D="50,670" Size2D="440,360" />
-  <ImageView Name="photo2" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/ambient/default/picture_02.jpg" Position2D="510,50" Size2D="440,560" />
-  <ImageView Name="photo3" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/ambient/default/picture_03.jpg" Position2D="510,630" Size2D="440,400" />
-  <ImageView Name="photo4" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/ambient/default/picture_04.jpg" Position2D="970,50" Size2D="440,280" />
-  <ImageView Name="photo5" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/ambient/default/picture_05.jpg" Position2D="970,350" Size2D="440,340" />
-  <ImageView Name="photo6" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/ambient/default/picture_06.jpg" Position2D="970,710" Size2D="440,320" />
-  <ImageView Name="photo7" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/ambient/default/picture_07.jpg" Position2D="1430,50" Size2D="440,440" />
-  <ImageView Name="photo8" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/ambient/default/picture_08.jpg" Position2D="1430,510" Size2D="440,520" />
-</ContentPage>
index 3eba652..7812769 100755 (executable)
@@ -25,9 +25,9 @@ namespace Tizen.NUI.Examples
 
         public AmbientMultiPage(Window win) : base (win)
         {
-            Content.BackgroundImage = "/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/ambient/photoboard_img_bg_01.png";
+            Root.BackgroundImage = "/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/ambient/photoboard_img_bg_01.png";
             ClearEvent += OnClearEvent;
-            Content.Opacity = 0.0f;
+            Root.Opacity = 0.0f;
         }
 
         /// <summary>
@@ -53,13 +53,13 @@ namespace Tizen.NUI.Examples
         {
             Console.WriteLine("AmbientMultiPage focused.");
             Animation animation = new Animation(2000);
-            animation.AnimateTo(Content, "Opacity", 1.0f);
+            animation.AnimateTo(Root, "Opacity", 1.0f);
             animation.Play();
         }
 
         private void OnClearEvent(object obj, EventArgs e)
         {
-            Content.BackgroundImage = "/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/ambient/photoboard_img_bg_01.png";
+            Root.BackgroundImage = "/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/ambient/photoboard_img_bg_01.png";
         }
     }
 }
\ No newline at end of file
diff --git a/test/NUITestSample/NUIXAMLTestSample/TestAmbient/AmbientMultiPage2.xaml b/test/NUITestSample/NUIXAMLTestSample/TestAmbient/AmbientMultiPage2.xaml
deleted file mode 100755 (executable)
index 83885ed..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ContentPage x:Class="Tizen.NUI.Examples.AmbientMultiPage2"
-  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
-
-
-  <ImageView Name="photo1" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/ambient/default/picture_07.jpg" Position2D="47,52" Size2D="440,440" />
-  <ImageView Name="photo2" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/ambient/default/picture_08.jpg" Position2D="47,512" Size2D="440,520" />
-  <ImageView Name="photo3" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/ambient/default/picture_02.jpg" Position2D="970,50" Size2D="440,560" />
-  <ImageView Name="photo4" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/ambient/default/picture_03.jpg" Position2D="970,630" Size2D="440,400" />
-  <ImageView Name="photo5" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/ambient/default/picture_04.jpg" Position2D="510,50" Size2D="440,280" />
-  <ImageView Name="photo6" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/ambient/default/picture_05.jpg" Position2D="510,350" Size2D="440,340" />
-  <ImageView Name="photo7" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/ambient/default/picture_06.jpg" Position2D="510,710" Size2D="440,320" />
-
-  <ImageView Name="photo0" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/ambient/bg_textbox_w.png" Position2D="1431,51" Size2D="440,600" />
-  <View Name="num_area" Size2D="440,160" Position2D="1431,51">
-    <ImageView Name="photo01" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/ambient/num/num_w_2.png" Position2D="0,0" Size2D="110,160" />
-    <ImageView Name="photo02" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/ambient/num/num_w_0.png" Position2D="110,0" Size2D="110,160" />
-    <ImageView Name="photo03" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/ambient/num/num_w_th.png" Position2D="220,0" Size2D="220,160" />
-  </View>
-  <View Name="mon_area" Size2D="440,194" Position2D="1431,211">
-    <ImageView Name="photo10" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/ambient/mon/mon_w_4.png" Position2D="0,0" Size2D="440,194" />
-  </View>
-  <View Name="year_area" Size2D="440,210" Position2D="1431,425">
-    <ImageView Name="photo21" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/ambient/year/year_w_2.png" Position2D="0,0" Size2D="110,210" />
-    <ImageView Name="photo22" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/ambient/year/year_w_0.png" Position2D="110,0" Size2D="110,210" />
-    <ImageView Name="photo23" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/ambient/year/year_w_1.png" Position2D="220,0" Size2D="110,210" />
-    <ImageView Name="photo24" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/ambient/year/year_w_8.png" Position2D="330,0" Size2D="110,210" />
-  </View>
-  <ImageView Name="photo8" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/ambient/default/picture_01.jpg" Position2D="1431,671" Size2D="440,360" />
-</ContentPage>
index 9ac1162..dd79060 100755 (executable)
@@ -25,9 +25,9 @@ namespace Tizen.NUI.Examples
 
         public AmbientMultiPage2(Window win) : base (win)
         {
-            Content.BackgroundImage = "/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/ambient/photoboard_img_bg_02.png";
+            Root.BackgroundImage = "/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/ambient/photoboard_img_bg_02.png";
             ClearEvent += OnClearEvent;
-            Content.Opacity = 0.0f;
+            Root.Opacity = 0.0f;
         }
 
         /// <summary>
@@ -53,13 +53,13 @@ namespace Tizen.NUI.Examples
         {
             Console.WriteLine("AmbientMulti2Page focused.");
             Animation animation = new Animation(2000);
-            animation.AnimateTo(Content, "Opacity", 1.0f);
+            animation.AnimateTo(Root, "Opacity", 1.0f);
             animation.Play();
         }
 
         private void OnClearEvent(object obj, EventArgs e)
         {
-            Content.BackgroundImage = "/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/ambient/photoboard_img_bg_02.png";
+            Root.BackgroundImage = "/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/ambient/photoboard_img_bg_02.png";
         }
     }
 }
\ No newline at end of file
diff --git a/test/NUITestSample/NUIXAMLTestSample/TestAmbient/AmbientMultiPage3.xaml b/test/NUITestSample/NUIXAMLTestSample/TestAmbient/AmbientMultiPage3.xaml
deleted file mode 100755 (executable)
index 87d16b0..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ContentPage x:Class="Tizen.NUI.Examples.AmbientMultiPage3"
-  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
-
-  <View BackgroundImage="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/ambient/photoboard_img_bg_03.png" Position2D="0,0" Size2D="1920,1080" >
-  <!-- <View BackgroundImage="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/ambient/photoboard_img_bg_04.png" Position2D="0,0" Size2D="1920,1080" > -->
-    <ImageView Name="photo0" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/ambient/bg_textbox_w.png" Position2D="50,50" Size2D="440,600" />
-    <View Name="num_area" Size2D="440,160" Position2D="50,50">
-      <ImageView Name="photo11" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/ambient/num/num_w_2.png" Position2D="0,0" Size2D="110,160" />
-      <ImageView Name="photo12" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/ambient/num/num_w_0.png" Position2D="110,0" Size2D="110,160" />
-      <ImageView Name="photo13" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/ambient/num/num_w_th.png" Position2D="220,0" Size2D="220,160" />
-    </View>
-    <View Name="mon_area" Size2D="440,194" Position2D="50,210">
-      <ImageView Name="photo21" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/ambient/mon/mon_w_4.png" Position2D="0,0" Size2D="440,194" />
-    </View>
-    <View Name="year_area" Size2D="440,210" Position2D="50,424">
-      <ImageView Name="photo31" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/ambient/year/year_w_2.png" Position2D="0,0" Size2D="110,210" />
-      <ImageView Name="photo32" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/ambient/year/year_w_0.png" Position2D="110,0" Size2D="110,210" />
-      <ImageView Name="photo33" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/ambient/year/year_w_1.png" Position2D="220,0" Size2D="110,210" />
-      <ImageView Name="photo34" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/ambient/year/year_w_8.png" Position2D="330,0" Size2D="110,210" />
-    </View>
-    <ImageView Name="photo1" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/ambient/default/picture_01.jpg" Position2D="50,670" Size2D="440,360" />
-    
-    <ImageView Name="photo2" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/ambient/default/picture_00.jpg" Position2D="508,50" Size2D="900,560" />
-    <ImageView Name="photo3" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/ambient/default/picture_03.jpg" Position2D="508,630" Size2D="440,400" />
-    <ImageView Name="photo6" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/ambient/default/picture_09.jpg" Position2D="968,630" Size2D="440,400" />
-    <!--
-    <ImageView Name="photo3" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/ambient/default/picture_03.jpg" Position2D="508,50" Size2D="440,400" />
-    <ImageView Name="photo6" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/ambient/default/picture_09.jpg" Position2D="966,50" Size2D="440,400" />
-    <ImageView Name="photo2" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/ambient/default/picture_00.jpg" Position2D="508,470" Size2D="900,560" />
-    -->
-    <ImageView Name="photo7" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/ambient/default/picture_07.jpg" Position2D="1430,50" Size2D="440,440" />
-    <ImageView Name="photo8" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/ambient/default/picture_08.jpg" Position2D="1430,510" Size2D="440,520" />
-  </View>
-</ContentPage>
index c559355..ba9cbd6 100755 (executable)
@@ -25,7 +25,7 @@ namespace Tizen.NUI.Examples
 
         public AmbientMultiPage3(Window win) : base (win)
         {
-            Content.Opacity = 0.0f;
+            Root.Opacity = 0.0f;
         }
 
         /// <summary>
@@ -49,7 +49,7 @@ namespace Tizen.NUI.Examples
         {
             Console.WriteLine("AmbientMulti3Page focused.");
             Animation animation = new Animation(2000);
-            animation.AnimateTo(Content, "Opacity", 1.0f);
+            animation.AnimateTo(Root, "Opacity", 1.0f);
             animation.Finished += (obj, e) => {Console.WriteLine("animation finished.");};
             animation.Play();
         }
index 1232d5f..db5bff0 100755 (executable)
@@ -9,7 +9,7 @@ namespace Tizen.NUI.Sample
 {
     public class AmbientScreenUXControl : NUIApplication
     {
-        static private string imagePath = "E:\\Dali\\dali-windows-backend\\csharp-demo\\res\\images\\Ambient Screen UX Control\\";
+        static private string imagePath = "/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/Ambient Screen UX Control/";
         private ImageView bgImg;
 
         protected override void OnCreate()
index 8aea20f..694d795 100755 (executable)
@@ -67,8 +67,8 @@ namespace Tizen.NUI.Examples
 
         public override void SetFocus()
         {
-            buttonClose = Content.FindChildByName("ButtonClose") as ImageView;
-            buttonSend = Content.FindChildByName("ButtonSend") as ImageView;
+            buttonClose = Root.FindChildByName("ButtonClose") as ImageView;
+            buttonSend = Root.FindChildByName("ButtonSend") as ImageView;
             FocusManager.Instance.FocusIndicator = new View();
             FocusManager.Instance.PreFocusChange += OnPreFocusChange;
         }
@@ -77,7 +77,7 @@ namespace Tizen.NUI.Examples
         {
             ImageView view = obj as ImageView;
             {
-                view.ResourceUrl = "/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/bixby/btn_focused_bg.png";
+                view.ResourceUrl = "/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/bixby/btn_focused_bg.png";
                 // view.Border = new Rectangle(14,14,20,20);
             }
             view.RaiseToTop();
@@ -95,7 +95,7 @@ namespace Tizen.NUI.Examples
         {
             ImageView view = obj as ImageView;
             {
-                view.ResourceUrl = "/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/bixby/btn_normal_bg.png";
+                view.ResourceUrl = "/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/bixby/btn_normal_bg.png";
                 // view.Border = new Rectangle(4,4,5,5);
             }
             if (scaleOutAni == null)
diff --git a/test/NUITestSample/NUIXAMLTestSample/TestAmbient/BixbyWidgetPage.xaml b/test/NUITestSample/NUIXAMLTestSample/TestAmbient/BixbyWidgetPage.xaml
deleted file mode 100755 (executable)
index 64102de..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ContentPage x:Class="Tizen.NUI.Examples.BixbyWidgetPage"
-  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
-
-  <View BackgroundImage="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/bixby/bg.png" Size2D="1920,1080">
-    <ImageView Name="Time" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/bixby/time.png" Position2D="25,310" Size2D="880,230"  />
-    <ImageView Name="Date" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/bixby/date_weather.png" Position2D="120,600" Size2D="680,50" />
-    <ImageView Name="Widget" Opacity="0" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/bixby/map_widget1.png" Position2D="1320,20" Size2D="600,380" />
-  </View>
-</ContentPage>
index f6aa9b0..10ea7dc 100755 (executable)
@@ -33,7 +33,7 @@ namespace Tizen.NUI.Examples
 
         public override void SetFocus()
         {
-            widget = Content.FindChildByName("Widget") as ImageView;
+            widget = Root.FindChildByName("Widget") as ImageView;
             Animation animation = new Animation(2000);
             animation.AnimateTo(widget, "Opacity", 1.0f);
             animation.Play();
index 1efa5ba..154c6c6 100755 (executable)
@@ -9,7 +9,7 @@ namespace Tizen.NUI.Sample
 {
     class Finance
     {
-        static private string imagePath = "E:\\Dali\\dali-windows-backend\\csharp-demo\\res\\images\\Ambient Screen UX Control\\";
+        static private string imagePath = "/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/Ambient Screen UX Control/";
 
         private ImageView[] cardImages = null;
         private Vector2[] positionOfCard = null;
index 73610e5..f055809 100755 (executable)
@@ -9,7 +9,7 @@ namespace Tizen.NUI.Sample
 {
     class OOBE
     {
-        static private string imagePath = "E:\\Dali\\dali-windows-backend\\csharp-demo\\res\\images\\Ambient Screen UX Control\\";
+        static private string imagePath = "/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/Ambient Screen UX Control/";
 
         private ImageView[] cardImages = null;
         private Vector2[] positionOfCard = null;
diff --git a/test/NUITestSample/NUIXAMLTestSample/TestAmbient/SearchPage.xaml b/test/NUITestSample/NUIXAMLTestSample/TestAmbient/SearchPage.xaml
deleted file mode 100755 (executable)
index f96e7ce..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<AppDetailPage x:Class="Tizen.NUI.Examples.SearchPage"
-  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
-    <View Name="UpperArea" BackgroundColor="Green" SizeWidth="1920" SizeHeight="332" ParentOrigin="TopLeft" PivotPoint="TopLeft" PositionY="30"  PositionUsesPivotPoint="true">
-        <TextLabel Text="TopResults" PointSize="25" SizeWidth="300" SizeHeight="50" PositionX="81" PositionY="0" />
-        <TableView Name="UpperListTable" Focusable="true" SizeWidth="1758" SizeHeight="250" PositionX="81" Rows="1" Columns="5" CellPadding="6,0" ParentOrigin="CenterLeft" PivotPoint="CenterLeft"  PositionUsesPivotPoint="true">
-            <ImageView Name="listItem11" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/youtube/ytb01.png" CellIndex="0,0" Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent" PivotPoint="CenterLeft"/>
-            <ImageView Name="listItem12" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/youtube/ytb02.png" CellIndex="0,1" Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent"/>
-            <ImageView Name="listItem13" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/youtube/ytb03.png" CellIndex="0,2" Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent"/>
-            <ImageView Name="listItem14" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/youtube/ytb04.png" CellIndex="0,3" Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent"/>
-            <ImageView Name="listItem15" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/youtube/ytb05.png" CellIndex="0,4" Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent"/>
-        </TableView>
-    </View>
-    <View Name="MidArea" BackgroundColor="Green" SizeWidth="1920" SizeHeight="332" ParentOrigin="TopLeft" PivotPoint="TopLeft" PositionY="390"  PositionUsesPivotPoint="true">
-        <TextLabel Text="Youtube" PointSize="25" SizeWidth="300" SizeHeight="50" PositionX="81" PositionY="0" />
-        <TableView Name="MidListTable" Focusable="true" SizeWidth="1758" SizeHeight="250" PositionX="81" Rows="1" Columns="5" CellPadding="6,0" ParentOrigin="CenterLeft" PivotPoint="CenterLeft"  PositionUsesPivotPoint="true">
-            <ImageView Name="listItem21" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/youtube/ytb06.png" CellIndex="0,0" Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent" PivotPoint="CenterLeft"/>
-            <ImageView Name="listItem22" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/youtube/ytb07.png" CellIndex="0,1" Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent"/>
-            <ImageView Name="listItem23" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/youtube/ytb08.png" CellIndex="0,2" Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent"/>
-            <ImageView Name="listItem24" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/youtube/ytb09.png" CellIndex="0,3" Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent"/>
-            <ImageView Name="listItem25" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/youtube/ytb010.png" CellIndex="0,4" Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent"/>
-        </TableView>
-    </View>
-    <View Name="BottomArea" BackgroundColor="Green" SizeWidth="1920" SizeHeight="332" ParentOrigin="TopLeft" PivotPoint="TopLeft" PositionY="748"  PositionUsesPivotPoint="true">
-        <TextLabel Text="Facebook" PointSize="25" SizeWidth="300" SizeHeight="50" PositionX="81" PositionY="0" />
-        <TableView Name="BottomListTable" Focusable="true" SizeWidth="1758" SizeHeight="250" PositionX="81" Rows="1" Columns="5" CellPadding="6,0" ParentOrigin="CenterLeft" PivotPoint="CenterLeft"  PositionUsesPivotPoint="true">
-            <ImageView Name="listItem31" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/youtube/ytb011.png" CellIndex="0,0" Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent" PivotPoint="CenterLeft"/>
-            <ImageView Name="listItem32" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/youtube/ytb012.png" CellIndex="0,1" Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent"/>
-            <ImageView Name="listItem33" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/youtube/ytb013.png" CellIndex="0,2" Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent"/>
-            <ImageView Name="listItem34" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/youtube/ytb014.png" CellIndex="0,3" Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent"/>
-            <ImageView Name="listItem35" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/youtube/ytb015.png" CellIndex="0,4" Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent"/>
-        </TableView>
-    </View>
-</AppDetailPage>
index 50cc820..effca33 100755 (executable)
@@ -34,7 +34,7 @@ namespace Tizen.NUI.Examples
 
         public SearchPage(Window win) : base (win)
         {
-            Content.BackgroundImage = "/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/store_default_bg_01.png";
+            Root.BackgroundImage = "/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/store_default_bg_01.png";
         }
 
         /// <summary>
@@ -68,9 +68,9 @@ namespace Tizen.NUI.Examples
 
         public override void SetFocus()
         {
-            upperListTable = Content.FindChildByName("UpperListTable") as TableView;
-            midListTable = Content.FindChildByName("MidListTable") as TableView;
-            bottomListTable = Content.FindChildByName("BottomListTable") as TableView;
+            upperListTable = Root.FindChildByName("UpperListTable") as TableView;
+            midListTable = Root.FindChildByName("MidListTable") as TableView;
+            bottomListTable = Root.FindChildByName("BottomListTable") as TableView;
  
             FocusManager.Instance.FocusIndicator = new View();
             FocusManager.Instance.SetCurrentFocusView(upperListTable.GetChildAt(0));
diff --git a/test/NUITestSample/NUIXAMLTestSample/TestAmbient/WeatherPage.xaml b/test/NUITestSample/NUIXAMLTestSample/TestAmbient/WeatherPage.xaml
deleted file mode 100755 (executable)
index f45b681..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ContentPage x:Class="Tizen.NUI.Examples.WeatherPage"
-  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
-
-  <ImageView Name="title" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/weather/up.bmp" Position2D="53,0" Size2D="1867,461" />
-  <ImageView Name="left" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/weather/left.bmp" Position2D="0,0" Size2D="53,1079" />
-  <View Name="content" Size2D="1920,1080" Position2D="0,0" BackgroundColor="0,0,0,0">
-     <TableView  Name="ListTable" Focusable="true" SizeWidth="1758" SizeHeight="360" PositionX="81" PositionY="560" Rows="1" Columns="5" CellPadding="33.8,0">
-            <ImageView ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/weather/current.bmp" CellIndex="0,0" Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent" />
-            <ImageView ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/weather/1.bmp" CellIndex="0,1" Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent" />
-            <ImageView ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/weather/2.bmp" CellIndex="0,2" Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent" />
-            <ImageView ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/weather/3.bmp" CellIndex="0,3" Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent" />
-            <ImageView ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/weather/4.bmp" CellIndex="0,4" Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent" />
-     </TableView>
-  </View>
-</ContentPage>
index d55de30..6fca69b 100755 (executable)
@@ -32,8 +32,8 @@ namespace Tizen.NUI.Examples
 
         public WeatherPage(Window win) : base (win)
         {
-            Content.BackgroundImage = "/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/weather/bg.bmp";
-            // Content.BackgroundColor = Color.Green;
+            Root.BackgroundImage = "/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/weather/bg.bmp";
+            // Root.BackgroundColor = Color.Green;
         }
 
         /// <summary>
@@ -61,7 +61,7 @@ namespace Tizen.NUI.Examples
 
         public override void SetFocus()
         {
-            listTable = Content.FindChildByName("ListTable") as TableView;
+            listTable = Root.FindChildByName("ListTable") as TableView;
 
             FocusManager.Instance.FocusIndicator = new View();
             FocusManager.Instance.SetCurrentFocusView(listTable.GetChildAt(0));
diff --git a/test/NUITestSample/NUIXAMLTestSample/TestDetailApps/AppDetailPage.xaml b/test/NUITestSample/NUIXAMLTestSample/TestDetailApps/AppDetailPage.xaml
deleted file mode 100755 (executable)
index 3a94d9e..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<AppDetailPage x:Class="Tizen.NUI.Examples.AppDetailPage"
-  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:l="clr-namespace:Tizen.UI_Xaml;assembly=Tizen.UI_Xaml"
-  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
-
-    <View Name="UpperArea" SizeWidth="1920" SizeHeight="780" ParentOrigin="TopLeft" PivotPoint="TopLeft" PositionUsesPivotPoint="true">
-        <ImageView ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/weather.png" SizeWidth="346" SizeHeight="350"
-                   PositionX="81" PositionY="81" ParentOrigin="TopLeft" PivotPoint="TopLeft" PositionUsesPivotPoint="true"/>
-        <TextLabel Text="The Weather Network" PointSize="60" PositionX="487" PositionY="100" SizeHeight="102" ParentOrigin="TopLeft" PivotPoint="TopLeft" PositionUsesPivotPoint="true"/>
-        <TextLabel Text="Information | The Weather Network | " PointSize="28" PositionX="487" PositionY="204" SizeWidth="670" SizeHeight="44" ParentOrigin="TopLeft" PivotPoint="TopLeft" PositionUsesPivotPoint="true"/>
-        <ImageView ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/r_icon_xs_star.png" PositionX="1160" PositionY="213" SizeWidth="26" SizeHeight="26" ParentOrigin="TopLeft" PivotPoint="TopLeft" PositionUsesPivotPoint="true" />
-        <ImageView ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/r_icon_xs_star.png" PositionX="1188" PositionY="213" SizeWidth="26" SizeHeight="26" ParentOrigin="TopLeft" PivotPoint="TopLeft" PositionUsesPivotPoint="true" />
-        <ImageView ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/r_icon_xs_star.png" PositionX="1216" PositionY="213" SizeWidth="26" SizeHeight="26" ParentOrigin="TopLeft" PivotPoint="TopLeft" PositionUsesPivotPoint="true" />
-        <ImageView ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/r_icon_xs_star.png" Opacity="0.3" PositionX="1244" PositionY="213" SizeWidth="26" SizeHeight="26" ParentOrigin="TopLeft" PivotPoint="TopLeft" PositionUsesPivotPoint="true" />
-        <ImageView ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/r_icon_xs_star.png" Opacity="0.3" PositionX="1272" PositionY="213" SizeWidth="26" SizeHeight="26" ParentOrigin="TopLeft" PivotPoint="TopLeft" PositionUsesPivotPoint="true" />
-        <TextLabel Text="Check the permissions by selecting More in the information area. By selecting Install, you agree to grant those permissions to this app."
-                   PointSize="16" PositionX="487" PositionY="250" SizeHeight="34" ParentOrigin="TopLeft" PivotPoint="TopLeft" PositionUsesPivotPoint="true"/>
-        <ImageView Name="DetailButton" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/c_basic_button_white_bg_normal.9.png" Border="4,4,5,5"  Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost" PositionX="487" PositionY="320" SizeWidth="260" SizeHeight="84" ParentOrigin="TopLeft" PivotPoint="Center">
-            <TextLabel Name="ButtonLabel" Text="Install" PointSize="25" HorizontalAlignment="Center" VerticalAlignment="Center" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent" />
-        </ImageView>
-        <TextLabel Text="Rated:All ages | Price:In-App Purchases | Size:11.74MB(Available 3.17GB)" PointSize="20" PositionX="81" PositionY="487" SizeHeight="38"
-                   ParentOrigin="TopLeft" PivotPoint="TopLeft" PositionUsesPivotPoint="true"/>
-        <TextLabel Text="Updated:2018/03/06 | Latest Version:3.0.15 | Language:English" PointSize="20" PositionX="81" PositionY="525" SizeHeight="38"
-                   ParentOrigin="TopLeft" PivotPoint="TopLeft" PositionUsesPivotPoint="true"/>
-        <TextLabel Text="The Weather Network app provides you with on-demand acess to the weather information you need with a click of you TV remote. Scroll through our forecasts to view conditions for the next 14 days. View radar maps to track coming storms. Stay information with notification of active warnings in your area. The app is loaded with features that will become an integral part of planning your ..."
-                   SizeWidth="1320" MultiLine="true" PointSize="20" PositionX="81" PositionY="601" SizeHeight="114"
-                   ParentOrigin="TopLeft" PivotPoint="TopLeft" PositionUsesPivotPoint="true"/>
-    </View>
-    <View Name="BottomArea" BackgroundColor="0,0,0,0.05" SizeWidth="1920" SizeHeight="332" ParentOrigin="TopLeft" PivotPoint="TopLeft" PositionY="748"  PositionUsesPivotPoint="true">
-        <TextLabel Text="ScreenShots" PointSize="25" SizeWidth="300" SizeHeight="50" PositionX="81" PositionY="0" />
-        <TableView Name="ListTable" Focusable="true" SizeWidth="1758" SizeHeight="200" PositionX="81" Rows="1" Columns="5" CellPadding="6,0" ParentOrigin="CenterLeft" PivotPoint="CenterLeft"  PositionUsesPivotPoint="true">
-            <ImageView Name="listItem1" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/weather_ss1.png" CellIndex="0,0" Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent" PivotPoint="CenterLeft"/>
-            <ImageView Name="listItem2" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/weather_ss2.png" CellIndex="0,1" Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent"/>
-            <ImageView Name="listItem3" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/weather_ss3.png" CellIndex="0,2" Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent"/>
-            <ImageView Name="listItem4" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/weather_ss2.png" CellIndex="0,3" Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent"/>
-            <ImageView Name="listItem5" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/weather_ss1.png" CellIndex="0,4" Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent"/>
-        </TableView>
-    </View>
-</AppDetailPage>
index b6bc351..2995a44 100755 (executable)
@@ -34,7 +34,7 @@ namespace Tizen.NUI.Examples
 
         public AppDetailPage(Window win) : base (win)
         {
-            Content.BackgroundImage = "/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/store_default_bg_01.png";
+            Root.BackgroundImage = "/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/store_default_bg_01.png";
         }
 
         /// <summary>
@@ -150,7 +150,7 @@ namespace Tizen.NUI.Examples
             ImageView view = obj as ImageView;
             if (view.Name == "DetailButton")
             {
-                view.ResourceUrl = "/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/r_highlight_bg_focus_9patch.png";
+                view.ResourceUrl = "/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/r_highlight_bg_focus_9patch.png";
                 view.Border = new Rectangle(14,14,20,20);
             }
             view.RaiseToTop();
@@ -169,7 +169,7 @@ namespace Tizen.NUI.Examples
             ImageView view = obj as ImageView;
             if (view.Name == "DetailButton")
             {
-                view.ResourceUrl = "/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/c_basic_button_white_bg_normal.9.png";
+                view.ResourceUrl = "/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/c_basic_button_white_bg_normal.9.png";
                 view.Border = new Rectangle(4,4,5,5);
             }
             if (scaleOutAni == null)
index 9d7d760..9de1c4c 100755 (executable)
@@ -34,7 +34,7 @@ namespace Tizen.NUI.Examples
 
         public MediaHubPage(Window win) : base (win)
         {
-            Content.BackgroundImage = "/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/mc_bg.png";
+            Root.BackgroundImage = "/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/mc_bg.png";
             ClearEvent += OnClearEvent;
         }
 
@@ -74,7 +74,7 @@ namespace Tizen.NUI.Examples
 
         private void OnClearEvent(object obj, EventArgs e)
         {
-            Content.BackgroundImage = "/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/mc_bg.png";
+            Root.BackgroundImage = "/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/mc_bg.png";
         }
 
         private View OnPreFocusChange(object obj, FocusManager.PreFocusChangeEventArgs e)
@@ -139,7 +139,7 @@ namespace Tizen.NUI.Examples
         private void OnOptionsFocusGained(object obj, EventArgs e)
         {
             ImageView view = obj as ImageView;
-            view.ResourceUrl = "/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/r_highlight_bg_focus_9patch.png";
+            view.ResourceUrl = "/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/r_highlight_bg_focus_9patch.png";
             view.Border = new Rectangle(14,14,20,20);
             view.RaiseToTop();
              if (scaleInAni == null)
@@ -155,7 +155,7 @@ namespace Tizen.NUI.Examples
         private void OnOptionsFocusLost(object obj, EventArgs e)
         {
             ImageView view = obj as ImageView;
-            view.ResourceUrl = "/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/c_basic_button_white_bg_normal.9.png";
+            view.ResourceUrl = "/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/c_basic_button_white_bg_normal.9.png";
             view.Border = new Rectangle(4,4,5,5);
             if (scaleOutAni == null)
             {
diff --git a/test/NUITestSample/NUIXAMLTestSample/res/layout/1920x1080/AmbientDuoPage.xaml b/test/NUITestSample/NUIXAMLTestSample/res/layout/1920x1080/AmbientDuoPage.xaml
new file mode 100755 (executable)
index 0000000..303bf81
--- /dev/null
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ContentPage x:Class="Tizen.NUI.Examples.AmbientDuoPage"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
+
+  <ImageView Name="photo00" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/ambient/default/picture_d_1.jpg" Position2D="287,260" Size2D="560,560" />
+  <ImageView Name="photo01" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/ambient/default/picture_d_2.jpg" Position2D="1073,260" Size2D="560,560" />
+</ContentPage>
diff --git a/test/NUITestSample/NUIXAMLTestSample/res/layout/1920x1080/AmbientMonoPage.xaml b/test/NUITestSample/NUIXAMLTestSample/res/layout/1920x1080/AmbientMonoPage.xaml
new file mode 100755 (executable)
index 0000000..a8ac493
--- /dev/null
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ContentPage x:Class="Tizen.NUI.Examples.AmbientMonoPage"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
+
+  <ImageView Name="photo" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/ambient/default/picture_m_1.jpg" Opacity="0" ParentOrigin="Center" PivotPoint="Center" PositionUsesPivotPoint="true" Size2D="1560,720" />
+  
+</ContentPage>
diff --git a/test/NUITestSample/NUIXAMLTestSample/res/layout/1920x1080/AmbientMultiPage.xaml b/test/NUITestSample/NUIXAMLTestSample/res/layout/1920x1080/AmbientMultiPage.xaml
new file mode 100755 (executable)
index 0000000..25b3fcb
--- /dev/null
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ContentPage x:Class="Tizen.NUI.Examples.AmbientMultiPage"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
+
+  <ImageView Name="photo0" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/ambient/bg_textbox_w.png" Position2D="50,50" Size2D="440,600" />
+  <View Name="num_area" Size2D="440,160" Position2D="50,50">
+    <ImageView Name="photo0" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/ambient/num/num_w_2.png" Position2D="0,0" Size2D="110,160" />
+    <ImageView Name="photo0" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/ambient/num/num_w_0.png" Position2D="110,0" Size2D="110,160" />
+    <ImageView Name="photo0" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/ambient/num/num_w_th.png" Position2D="220,0" Size2D="220,160" />
+  </View>
+  <View Name="mon_area" Size2D="440,194" Position2D="50,210">
+    <ImageView Name="photo0" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/ambient/mon/mon_w_4.png" Position2D="0,0" Size2D="440,194" />
+  </View>
+  <View Name="year_area" Size2D="440,210" Position2D="50,424">
+    <ImageView Name="photo0" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/ambient/year/year_w_2.png" Position2D="0,0" Size2D="110,210" />
+    <ImageView Name="photo0" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/ambient/year/year_w_0.png" Position2D="110,0" Size2D="110,210" />
+    <ImageView Name="photo0" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/ambient/year/year_w_1.png" Position2D="220,0" Size2D="110,210" />
+    <ImageView Name="photo0" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/ambient/year/year_w_8.png" Position2D="330,0" Size2D="110,210" />
+  </View>
+  <ImageView Name="photo1" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/ambient/default/picture_01.jpg" Position2D="50,670" Size2D="440,360" />
+  <ImageView Name="photo2" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/ambient/default/picture_02.jpg" Position2D="510,50" Size2D="440,560" />
+  <ImageView Name="photo3" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/ambient/default/picture_03.jpg" Position2D="510,630" Size2D="440,400" />
+  <ImageView Name="photo4" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/ambient/default/picture_04.jpg" Position2D="970,50" Size2D="440,280" />
+  <ImageView Name="photo5" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/ambient/default/picture_05.jpg" Position2D="970,350" Size2D="440,340" />
+  <ImageView Name="photo6" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/ambient/default/picture_06.jpg" Position2D="970,710" Size2D="440,320" />
+  <ImageView Name="photo7" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/ambient/default/picture_07.jpg" Position2D="1430,50" Size2D="440,440" />
+  <ImageView Name="photo8" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/ambient/default/picture_08.jpg" Position2D="1430,510" Size2D="440,520" />
+</ContentPage>
diff --git a/test/NUITestSample/NUIXAMLTestSample/res/layout/1920x1080/AmbientMultiPage2.xaml b/test/NUITestSample/NUIXAMLTestSample/res/layout/1920x1080/AmbientMultiPage2.xaml
new file mode 100755 (executable)
index 0000000..df235cf
--- /dev/null
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ContentPage x:Class="Tizen.NUI.Examples.AmbientMultiPage2"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
+
+
+  <ImageView Name="photo1" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/ambient/default/picture_07.jpg" Position2D="47,52" Size2D="440,440" />
+  <ImageView Name="photo2" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/ambient/default/picture_08.jpg" Position2D="47,512" Size2D="440,520" />
+  <ImageView Name="photo3" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/ambient/default/picture_02.jpg" Position2D="970,50" Size2D="440,560" />
+  <ImageView Name="photo4" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/ambient/default/picture_03.jpg" Position2D="970,630" Size2D="440,400" />
+  <ImageView Name="photo5" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/ambient/default/picture_04.jpg" Position2D="510,50" Size2D="440,280" />
+  <ImageView Name="photo6" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/ambient/default/picture_05.jpg" Position2D="510,350" Size2D="440,340" />
+  <ImageView Name="photo7" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/ambient/default/picture_06.jpg" Position2D="510,710" Size2D="440,320" />
+
+  <ImageView Name="photo0" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/ambient/bg_textbox_w.png" Position2D="1431,51" Size2D="440,600" />
+  <View Name="num_area" Size2D="440,160" Position2D="1431,51">
+    <ImageView Name="photo01" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/ambient/num/num_w_2.png" Position2D="0,0" Size2D="110,160" />
+    <ImageView Name="photo02" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/ambient/num/num_w_0.png" Position2D="110,0" Size2D="110,160" />
+    <ImageView Name="photo03" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/ambient/num/num_w_th.png" Position2D="220,0" Size2D="220,160" />
+  </View>
+  <View Name="mon_area" Size2D="440,194" Position2D="1431,211">
+    <ImageView Name="photo10" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/ambient/mon/mon_w_4.png" Position2D="0,0" Size2D="440,194" />
+  </View>
+  <View Name="year_area" Size2D="440,210" Position2D="1431,425">
+    <ImageView Name="photo21" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/ambient/year/year_w_2.png" Position2D="0,0" Size2D="110,210" />
+    <ImageView Name="photo22" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/ambient/year/year_w_0.png" Position2D="110,0" Size2D="110,210" />
+    <ImageView Name="photo23" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/ambient/year/year_w_1.png" Position2D="220,0" Size2D="110,210" />
+    <ImageView Name="photo24" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/ambient/year/year_w_8.png" Position2D="330,0" Size2D="110,210" />
+  </View>
+  <ImageView Name="photo8" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/ambient/default/picture_01.jpg" Position2D="1431,671" Size2D="440,360" />
+</ContentPage>
diff --git a/test/NUITestSample/NUIXAMLTestSample/res/layout/1920x1080/AmbientMultiPage3.xaml b/test/NUITestSample/NUIXAMLTestSample/res/layout/1920x1080/AmbientMultiPage3.xaml
new file mode 100755 (executable)
index 0000000..f008605
--- /dev/null
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ContentPage x:Class="Tizen.NUI.Examples.AmbientMultiPage3"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
+
+  <View BackgroundImage="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/ambient/photoboard_img_bg_03.png" Position2D="0,0" Size2D="1920,1080" >
+  <!-- <View BackgroundImage="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/ambient/photoboard_img_bg_04.png" Position2D="0,0" Size2D="1920,1080" > -->
+    <ImageView Name="photo0" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/ambient/bg_textbox_w.png" Position2D="50,50" Size2D="440,600" />
+    <View Name="num_area" Size2D="440,160" Position2D="50,50">
+      <ImageView Name="photo11" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/ambient/num/num_w_2.png" Position2D="0,0" Size2D="110,160" />
+      <ImageView Name="photo12" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/ambient/num/num_w_0.png" Position2D="110,0" Size2D="110,160" />
+      <ImageView Name="photo13" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/ambient/num/num_w_th.png" Position2D="220,0" Size2D="220,160" />
+    </View>
+    <View Name="mon_area" Size2D="440,194" Position2D="50,210">
+      <ImageView Name="photo21" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/ambient/mon/mon_w_4.png" Position2D="0,0" Size2D="440,194" />
+    </View>
+    <View Name="year_area" Size2D="440,210" Position2D="50,424">
+      <ImageView Name="photo31" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/ambient/year/year_w_2.png" Position2D="0,0" Size2D="110,210" />
+      <ImageView Name="photo32" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/ambient/year/year_w_0.png" Position2D="110,0" Size2D="110,210" />
+      <ImageView Name="photo33" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/ambient/year/year_w_1.png" Position2D="220,0" Size2D="110,210" />
+      <ImageView Name="photo34" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/ambient/year/year_w_8.png" Position2D="330,0" Size2D="110,210" />
+    </View>
+    <ImageView Name="photo1" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/ambient/default/picture_01.jpg" Position2D="50,670" Size2D="440,360" />
+    
+    <ImageView Name="photo2" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/ambient/default/picture_00.jpg" Position2D="508,50" Size2D="900,560" />
+    <ImageView Name="photo3" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/ambient/default/picture_03.jpg" Position2D="508,630" Size2D="440,400" />
+    <ImageView Name="photo6" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/ambient/default/picture_09.jpg" Position2D="968,630" Size2D="440,400" />
+    <!--
+    <ImageView Name="photo3" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/ambient/default/picture_03.jpg" Position2D="508,50" Size2D="440,400" />
+    <ImageView Name="photo6" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/ambient/default/picture_09.jpg" Position2D="966,50" Size2D="440,400" />
+    <ImageView Name="photo2" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/ambient/default/picture_00.jpg" Position2D="508,470" Size2D="900,560" />
+    -->
+    <ImageView Name="photo7" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/ambient/default/picture_07.jpg" Position2D="1430,50" Size2D="440,440" />
+    <ImageView Name="photo8" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/ambient/default/picture_08.jpg" Position2D="1430,510" Size2D="440,520" />
+  </View>
+</ContentPage>
diff --git a/test/NUITestSample/NUIXAMLTestSample/res/layout/1920x1080/AppDetailPage.xaml b/test/NUITestSample/NUIXAMLTestSample/res/layout/1920x1080/AppDetailPage.xaml
new file mode 100755 (executable)
index 0000000..d88eed3
--- /dev/null
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<AppDetailPage x:Class="Tizen.NUI.Examples.AppDetailPage"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:l="clr-namespace:Tizen.UI_Xaml;assembly=Tizen.UI_Xaml"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
+
+    <View Name="UpperArea" SizeWidth="1920" SizeHeight="780" ParentOrigin="TopLeft" PivotPoint="TopLeft" PositionUsesPivotPoint="true">
+        <ImageView ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/weather.png" SizeWidth="346" SizeHeight="350"
+                   PositionX="81" PositionY="81" ParentOrigin="TopLeft" PivotPoint="TopLeft" PositionUsesPivotPoint="true"/>
+        <TextLabel Text="The Weather Network" PointSize="60" PositionX="487" PositionY="100" SizeHeight="102" ParentOrigin="TopLeft" PivotPoint="TopLeft" PositionUsesPivotPoint="true"/>
+        <TextLabel Text="Information | The Weather Network | " PointSize="28" PositionX="487" PositionY="204" SizeWidth="670" SizeHeight="44" ParentOrigin="TopLeft" PivotPoint="TopLeft" PositionUsesPivotPoint="true"/>
+        <ImageView ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/r_icon_xs_star.png" PositionX="1160" PositionY="213" SizeWidth="26" SizeHeight="26" ParentOrigin="TopLeft" PivotPoint="TopLeft" PositionUsesPivotPoint="true" />
+        <ImageView ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/r_icon_xs_star.png" PositionX="1188" PositionY="213" SizeWidth="26" SizeHeight="26" ParentOrigin="TopLeft" PivotPoint="TopLeft" PositionUsesPivotPoint="true" />
+        <ImageView ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/r_icon_xs_star.png" PositionX="1216" PositionY="213" SizeWidth="26" SizeHeight="26" ParentOrigin="TopLeft" PivotPoint="TopLeft" PositionUsesPivotPoint="true" />
+        <ImageView ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/r_icon_xs_star.png" Opacity="0.3" PositionX="1244" PositionY="213" SizeWidth="26" SizeHeight="26" ParentOrigin="TopLeft" PivotPoint="TopLeft" PositionUsesPivotPoint="true" />
+        <ImageView ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/r_icon_xs_star.png" Opacity="0.3" PositionX="1272" PositionY="213" SizeWidth="26" SizeHeight="26" ParentOrigin="TopLeft" PivotPoint="TopLeft" PositionUsesPivotPoint="true" />
+        <TextLabel Text="Check the permissions by selecting More in the information area. By selecting Install, you agree to grant those permissions to this app."
+                   PointSize="16" PositionX="487" PositionY="250" SizeHeight="34" ParentOrigin="TopLeft" PivotPoint="TopLeft" PositionUsesPivotPoint="true"/>
+        <ImageView Name="DetailButton" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/c_basic_button_white_bg_normal.9.png" Border="4,4,5,5"  Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost" PositionX="487" PositionY="320" SizeWidth="260" SizeHeight="84" ParentOrigin="TopLeft" PivotPoint="Center">
+            <TextLabel Name="ButtonLabel" Text="Install" PointSize="25" HorizontalAlignment="Center" VerticalAlignment="Center" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent" />
+        </ImageView>
+        <TextLabel Text="Rated:All ages | Price:In-App Purchases | Size:11.74MB(Available 3.17GB)" PointSize="20" PositionX="81" PositionY="487" SizeHeight="38"
+                   ParentOrigin="TopLeft" PivotPoint="TopLeft" PositionUsesPivotPoint="true"/>
+        <TextLabel Text="Updated:2018/03/06 | Latest Version:3.0.15 | Language:English" PointSize="20" PositionX="81" PositionY="525" SizeHeight="38"
+                   ParentOrigin="TopLeft" PivotPoint="TopLeft" PositionUsesPivotPoint="true"/>
+        <TextLabel Text="The Weather Network app provides you with on-demand acess to the weather information you need with a click of you TV remote. Scroll through our forecasts to view conditions for the next 14 days. View radar maps to track coming storms. Stay information with notification of active warnings in your area. The app is loaded with features that will become an integral part of planning your ..."
+                   SizeWidth="1320" MultiLine="true" PointSize="20" PositionX="81" PositionY="601" SizeHeight="114"
+                   ParentOrigin="TopLeft" PivotPoint="TopLeft" PositionUsesPivotPoint="true"/>
+    </View>
+    <View Name="BottomArea" BackgroundColor="0,0,0,0.05" SizeWidth="1920" SizeHeight="332" ParentOrigin="TopLeft" PivotPoint="TopLeft" PositionY="748"  PositionUsesPivotPoint="true">
+        <TextLabel Text="ScreenShots" PointSize="25" SizeWidth="300" SizeHeight="50" PositionX="81" PositionY="0" />
+        <TableView Name="ListTable" Focusable="true" SizeWidth="1758" SizeHeight="200" PositionX="81" Rows="1" Columns="5" CellPadding="6,0" ParentOrigin="CenterLeft" PivotPoint="CenterLeft"  PositionUsesPivotPoint="true">
+            <ImageView Name="listItem1" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/weather_ss1.png" CellIndex="0,0" Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent" PivotPoint="CenterLeft"/>
+            <ImageView Name="listItem2" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/weather_ss2.png" CellIndex="0,1" Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent"/>
+            <ImageView Name="listItem3" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/weather_ss3.png" CellIndex="0,2" Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent"/>
+            <ImageView Name="listItem4" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/weather_ss2.png" CellIndex="0,3" Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent"/>
+            <ImageView Name="listItem5" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/weather_ss1.png" CellIndex="0,4" Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent"/>
+        </TableView>
+    </View>
+</AppDetailPage>
@@ -3,13 +3,13 @@
   xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
   xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
 
-  <View BackgroundImage="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/bixby/bg.png" Size2D="1920,1080" >
-    <ImageView Name="Finance" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/bixby/finance_content.png" Position2D="1300,0" Size2D="620,1080" >
-      <ImageView Name="ButtonClose" Focusable="true" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/bixby/btn_normal_bg.png"
+  <View BackgroundImage="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/bixby/bg.png" Size2D="1920,1080" >
+    <ImageView Name="Finance" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/bixby/finance_content.png" Position2D="1300,0" Size2D="620,1080" >
+      <ImageView Name="ButtonClose" Focusable="true" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/bixby/btn_normal_bg.png"
                  Size2D="280,63" Position2D="20,990" FocusGained="OnFocusGained" FocusLost="OnFocusLost">
         <TextLabel Text="Close" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent" HorizontalAlignment="Center" VerticalAlignment="Center" />
       </ImageView>
-      <ImageView Name="ButtonSend" Focusable="true" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/bixby/btn_normal_bg.png"
+      <ImageView Name="ButtonSend" Focusable="true" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/bixby/btn_normal_bg.png"
                  Size2D="280,63" Position2D="340,990" FocusGained="OnFocusGained" FocusLost="OnFocusLost">
         <TextLabel Text="Send to phone" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent" HorizontalAlignment="Center" VerticalAlignment="Center" />
       </ImageView>
diff --git a/test/NUITestSample/NUIXAMLTestSample/res/layout/1920x1080/BixbyWidgetPage.xaml b/test/NUITestSample/NUIXAMLTestSample/res/layout/1920x1080/BixbyWidgetPage.xaml
new file mode 100755 (executable)
index 0000000..f5cd148
--- /dev/null
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ContentPage x:Class="Tizen.NUI.Examples.BixbyWidgetPage"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
+
+  <View BackgroundImage="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/bixby/bg.png" Size2D="1920,1080">
+    <ImageView Name="Time" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/bixby/time.png" Position2D="25,310" Size2D="880,230"  />
+    <ImageView Name="Date" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/bixby/date_weather.png" Position2D="120,600" Size2D="680,50" />
+    <ImageView Name="Widget" Opacity="0" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/bixby/map_widget1.png" Position2D="1320,20" Size2D="600,380" />
+  </View>
+</ContentPage>
@@ -4,76 +4,76 @@
   xmlns:l="clr-namespace:Tizen.UI_Xaml;assembly=Tizen.UI_Xaml"
   xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
 
-    <View Name="MainTitleArea" PositionX="0" PositionY="0" BackgroundImage="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/mc_title_bg.png" SizeWidth="1920" SizeHeight="120" ParentOrigin="TopLeft" PivotPoint="TopLeft" PositionUsesPivotPoint="true">
+    <View Name="MainTitleArea" PositionX="0" PositionY="0" BackgroundImage="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/mc_title_bg.png" SizeWidth="1920" SizeHeight="120" ParentOrigin="TopLeft" PivotPoint="TopLeft" PositionUsesPivotPoint="true">
         <TextLabel Name="MainTitle" Text="DataTraveler 2.0" PointSize="50" TextColor="White" PositionX="30" ParentOrigin="CenterLeft" PivotPoint="CenterLeft" PositionUsesPivotPoint="true" />
     </View>
-    <View Name="SubTitleArea" PositionX="0" PositionY="120" BackgroundImage="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/mc_shadow_titlebar.png" SizeWidth="1920" SizeHeight="78" ParentOrigin="TopLeft" PivotPoint="TopLeft" PositionUsesPivotPoint="true">
+    <View Name="SubTitleArea" PositionX="0" PositionY="120" BackgroundImage="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/mc_shadow_titlebar.png" SizeWidth="1920" SizeHeight="78" ParentOrigin="TopLeft" PivotPoint="TopLeft" PositionUsesPivotPoint="true">
         <TextLabel Name="SubTitle" Text="DataTraveler 2.0" PointSize="30" TextColor="White" PositionX="40" ParentOrigin="CenterLeft" PivotPoint="CenterLeft" PositionUsesPivotPoint="true" />
     </View>
     <View Name="ContentArea" PositionX="0" PositionY="198" SizeWidth="1920" SizeHeight="882" ParentOrigin="TopLeft" PivotPoint="TopLeft" PositionUsesPivotPoint="true">
         <TableView Name="ContentTable" Focusable="true" SizeWidth="1820" SizeHeight="600" PositionX="50" PositionY="50" Rows="2" Columns="8" CellPadding="4.75,12">
             <View Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost" BackgroundColor="White" CellIndex="0,0" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent">
-                <ImageView ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/mc_folder.png" SizeWidth="218" SizeHeight="226" ParentOrigin="TopCenter" PivotPoint="TopCenter" PositionUsesPivotPoint="true"/>
+                <ImageView ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/mc_folder.png" SizeWidth="218" SizeHeight="226" ParentOrigin="TopCenter" PivotPoint="TopCenter" PositionUsesPivotPoint="true"/>
                 <TextLabel Text="Text" SizeWidth="218" SizeHeight="50" HorizontalAlignment="Center" VerticalAlignment="Center" ParentOrigin="BottomCenter" PivotPoint="BottomCenter" PositionUsesPivotPoint="true" />
             </View>
             <View Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost" BackgroundColor="White" CellIndex="0,1" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent">
-                <ImageView ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/mc_folder.png" SizeWidth="218" SizeHeight="226" ParentOrigin="TopCenter" PivotPoint="TopCenter" PositionUsesPivotPoint="true"/>
+                <ImageView ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/mc_folder.png" SizeWidth="218" SizeHeight="226" ParentOrigin="TopCenter" PivotPoint="TopCenter" PositionUsesPivotPoint="true"/>
                 <TextLabel Text="Text" SizeWidth="218" SizeHeight="50" HorizontalAlignment="Center" VerticalAlignment="Center" ParentOrigin="BottomCenter" PivotPoint="BottomCenter" PositionUsesPivotPoint="true" />
             </View>
             <View Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost" BackgroundColor="White" CellIndex="0,2" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent">
-                <ImageView ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/mc_folder.png" SizeWidth="218" SizeHeight="226" ParentOrigin="TopCenter" PivotPoint="TopCenter" PositionUsesPivotPoint="true"/>
+                <ImageView ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/mc_folder.png" SizeWidth="218" SizeHeight="226" ParentOrigin="TopCenter" PivotPoint="TopCenter" PositionUsesPivotPoint="true"/>
                 <TextLabel Text="Text" SizeWidth="218" SizeHeight="50" HorizontalAlignment="Center" VerticalAlignment="Center" ParentOrigin="BottomCenter" PivotPoint="BottomCenter" PositionUsesPivotPoint="true" />
             </View>
             <View Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost" BackgroundColor="White" CellIndex="0,3" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent">
-                <ImageView ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/mc_folder.png" SizeWidth="218" SizeHeight="226" ParentOrigin="TopCenter" PivotPoint="TopCenter" PositionUsesPivotPoint="true"/>
+                <ImageView ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/mc_folder.png" SizeWidth="218" SizeHeight="226" ParentOrigin="TopCenter" PivotPoint="TopCenter" PositionUsesPivotPoint="true"/>
                 <TextLabel Text="Text" SizeWidth="218" SizeHeight="50" HorizontalAlignment="Center" VerticalAlignment="Center" ParentOrigin="BottomCenter" PivotPoint="BottomCenter" PositionUsesPivotPoint="true" />
             </View>
             <View Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost" BackgroundColor="White" CellIndex="0,4" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent">
-                <ImageView ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/mc_folder.png" SizeWidth="218" SizeHeight="226" ParentOrigin="TopCenter" PivotPoint="TopCenter" PositionUsesPivotPoint="true"/>
+                <ImageView ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/mc_folder.png" SizeWidth="218" SizeHeight="226" ParentOrigin="TopCenter" PivotPoint="TopCenter" PositionUsesPivotPoint="true"/>
                 <TextLabel Text="Text" SizeWidth="218" SizeHeight="50" HorizontalAlignment="Center" VerticalAlignment="Center" ParentOrigin="BottomCenter" PivotPoint="BottomCenter" PositionUsesPivotPoint="true" />
             </View>
             <View Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost" BackgroundColor="White" CellIndex="0,5" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent">
-                <ImageView ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/mc_folder.png" SizeWidth="218" SizeHeight="226" ParentOrigin="TopCenter" PivotPoint="TopCenter" PositionUsesPivotPoint="true"/>
+                <ImageView ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/mc_folder.png" SizeWidth="218" SizeHeight="226" ParentOrigin="TopCenter" PivotPoint="TopCenter" PositionUsesPivotPoint="true"/>
                 <TextLabel Text="Text" SizeWidth="218" SizeHeight="50" HorizontalAlignment="Center" VerticalAlignment="Center"  ParentOrigin="BottomCenter" PivotPoint="BottomCenter" PositionUsesPivotPoint="true" />
             </View>
             <View Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost" BackgroundColor="White" CellIndex="0,6" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent">
-                <ImageView ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/mc_folder.png" SizeWidth="218" SizeHeight="226" ParentOrigin="TopCenter" PivotPoint="TopCenter" PositionUsesPivotPoint="true"/>
+                <ImageView ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/mc_folder.png" SizeWidth="218" SizeHeight="226" ParentOrigin="TopCenter" PivotPoint="TopCenter" PositionUsesPivotPoint="true"/>
                 <TextLabel Text="Text" SizeWidth="218" SizeHeight="50" HorizontalAlignment="Center" VerticalAlignment="Center" ParentOrigin="BottomCenter" PivotPoint="BottomCenter" PositionUsesPivotPoint="true" />
             </View>
             <View Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost" BackgroundColor="White" CellIndex="0,7" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent">
-                <ImageView ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/mc_folder.png" SizeWidth="218" SizeHeight="226" ParentOrigin="TopCenter" PivotPoint="TopCenter" PositionUsesPivotPoint="true"/>
+                <ImageView ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/mc_folder.png" SizeWidth="218" SizeHeight="226" ParentOrigin="TopCenter" PivotPoint="TopCenter" PositionUsesPivotPoint="true"/>
                 <TextLabel Text="Text" SizeWidth="218" SizeHeight="50" HorizontalAlignment="Center" VerticalAlignment="Center" ParentOrigin="BottomCenter" PivotPoint="BottomCenter" PositionUsesPivotPoint="true" />
             </View>
             <View Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost" BackgroundColor="White" CellIndex="1,0" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent">
-                <ImageView ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/mc_folder.png" SizeWidth="218" SizeHeight="226" ParentOrigin="TopCenter" PivotPoint="TopCenter" PositionUsesPivotPoint="true"/>
+                <ImageView ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/mc_folder.png" SizeWidth="218" SizeHeight="226" ParentOrigin="TopCenter" PivotPoint="TopCenter" PositionUsesPivotPoint="true"/>
                 <TextLabel Text="Text" SizeWidth="218" SizeHeight="50" HorizontalAlignment="Center" VerticalAlignment="Center" ParentOrigin="BottomCenter" PivotPoint="BottomCenter" PositionUsesPivotPoint="true" />
             </View>
             <View Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost" BackgroundColor="White" CellIndex="1,1" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent">
-                <ImageView ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/mc_folder.png" SizeWidth="218" SizeHeight="226" ParentOrigin="TopCenter" PivotPoint="TopCenter" PositionUsesPivotPoint="true"/>
+                <ImageView ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/mc_folder.png" SizeWidth="218" SizeHeight="226" ParentOrigin="TopCenter" PivotPoint="TopCenter" PositionUsesPivotPoint="true"/>
                 <TextLabel Text="Text" SizeWidth="218" SizeHeight="50" HorizontalAlignment="Center" VerticalAlignment="Center" ParentOrigin="BottomCenter" PivotPoint="BottomCenter" PositionUsesPivotPoint="true" />
             </View>
             <View Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost" BackgroundColor="White" CellIndex="1,2" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent">
-                <ImageView ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/mc_folder.png" SizeWidth="218" SizeHeight="226" ParentOrigin="TopCenter" PivotPoint="TopCenter" PositionUsesPivotPoint="true"/>
+                <ImageView ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/mc_folder.png" SizeWidth="218" SizeHeight="226" ParentOrigin="TopCenter" PivotPoint="TopCenter" PositionUsesPivotPoint="true"/>
                 <TextLabel Text="Text" SizeWidth="218" SizeHeight="50" HorizontalAlignment="Center" VerticalAlignment="Center" ParentOrigin="BottomCenter" PivotPoint="BottomCenter" PositionUsesPivotPoint="true" />
             </View>
             <View Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost" BackgroundColor="White" CellIndex="1,3" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent">
-                <ImageView ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/mc_folder.png" SizeWidth="218" SizeHeight="226" ParentOrigin="TopCenter" PivotPoint="TopCenter" PositionUsesPivotPoint="true"/>
+                <ImageView ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/mc_folder.png" SizeWidth="218" SizeHeight="226" ParentOrigin="TopCenter" PivotPoint="TopCenter" PositionUsesPivotPoint="true"/>
                 <TextLabel Text="Text" SizeWidth="218" SizeHeight="50" HorizontalAlignment="Center" VerticalAlignment="Center" ParentOrigin="BottomCenter" PivotPoint="BottomCenter" PositionUsesPivotPoint="true" />
             </View>
             <View Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost" BackgroundColor="White" CellIndex="1,4" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent">
-                <ImageView ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/mc_folder.png" SizeWidth="218" SizeHeight="226" ParentOrigin="TopCenter" PivotPoint="TopCenter" PositionUsesPivotPoint="true"/>
+                <ImageView ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/mc_folder.png" SizeWidth="218" SizeHeight="226" ParentOrigin="TopCenter" PivotPoint="TopCenter" PositionUsesPivotPoint="true"/>
                 <TextLabel Text="Text" SizeWidth="218" SizeHeight="50" HorizontalAlignment="Center" VerticalAlignment="Center" ParentOrigin="BottomCenter" PivotPoint="BottomCenter" PositionUsesPivotPoint="true" />
             </View>
             <View Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost" BackgroundColor="White" CellIndex="1,5" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent">
-                <ImageView ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/mc_folder.png" SizeWidth="218" SizeHeight="226" ParentOrigin="TopCenter" PivotPoint="TopCenter" PositionUsesPivotPoint="true"/>
+                <ImageView ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/mc_folder.png" SizeWidth="218" SizeHeight="226" ParentOrigin="TopCenter" PivotPoint="TopCenter" PositionUsesPivotPoint="true"/>
                 <TextLabel Text="Text" SizeWidth="218" SizeHeight="50" HorizontalAlignment="Center" VerticalAlignment="Center" ParentOrigin="BottomCenter" PivotPoint="BottomCenter" PositionUsesPivotPoint="true" />
             </View>
             <View Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost" BackgroundColor="White" CellIndex="1,6" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent">
-                <ImageView ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/mc_folder.png" SizeWidth="218" SizeHeight="226" ParentOrigin="TopCenter" PivotPoint="TopCenter" PositionUsesPivotPoint="true"/>
+                <ImageView ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/mc_folder.png" SizeWidth="218" SizeHeight="226" ParentOrigin="TopCenter" PivotPoint="TopCenter" PositionUsesPivotPoint="true"/>
                 <TextLabel Text="Text" SizeWidth="218" SizeHeight="50" HorizontalAlignment="Center" VerticalAlignment="Center" ParentOrigin="BottomCenter" PivotPoint="BottomCenter" PositionUsesPivotPoint="true" />
             </View>
             <View Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost" BackgroundColor="White" CellIndex="1,7" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent">
-                <ImageView ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/mc_folder.png" SizeWidth="218" SizeHeight="226" ParentOrigin="TopCenter" PivotPoint="TopCenter" PositionUsesPivotPoint="true"/>
+                <ImageView ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/mc_folder.png" SizeWidth="218" SizeHeight="226" ParentOrigin="TopCenter" PivotPoint="TopCenter" PositionUsesPivotPoint="true"/>
                 <TextLabel Text="Text" SizeWidth="218" SizeHeight="50" HorizontalAlignment="Center" VerticalAlignment="Center" ParentOrigin="BottomCenter" PivotPoint="BottomCenter" PositionUsesPivotPoint="true" />
             </View>
 
 
 
         <TableView Name="OptionList" Focusable="true" SizeWidth="1110" SizeHeight="80" PositionX="770" PositionY="760" Rows="1" Columns="3" CellPadding="15, 0">
-            <ImageView Name="Options1" CellIndex="0,0" Focusable="true" FocusGained="OnOptionsFocusGained" FocusLost="OnOptionsFocusLost" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/c_basic_button_white_bg_normal.9.png" Border="4,4,5,5" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent" >
+            <ImageView Name="Options1" CellIndex="0,0" Focusable="true" FocusGained="OnOptionsFocusGained" FocusLost="OnOptionsFocusLost" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/c_basic_button_white_bg_normal.9.png" Border="4,4,5,5" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent" >
                 <TextLabel Text="Filter By:All" PointSize="25" HorizontalAlignment="Center" VerticalAlignment="Center" ParentOrigin="Center" PivotPoint="Center" PositionUsesPivotPoint="true" />
             </ImageView>
-            <ImageView Name="Options2" CellIndex="0,1" Focusable="true" FocusGained="OnOptionsFocusGained" FocusLost="OnOptionsFocusLost" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/c_basic_button_white_bg_normal.9.png" Border="4,4,5,5" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent" >
+            <ImageView Name="Options2" CellIndex="0,1" Focusable="true" FocusGained="OnOptionsFocusGained" FocusLost="OnOptionsFocusLost" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/c_basic_button_white_bg_normal.9.png" Border="4,4,5,5" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent" >
                 <TextLabel Text="Sort By:Title" PointSize="25" HorizontalAlignment="Center" VerticalAlignment="Center" ParentOrigin="Center" PivotPoint="Center" PositionUsesPivotPoint="true" />
             </ImageView>
-            <ImageView Name="Options3" CellIndex="0,2" Focusable="true" FocusGained="OnOptionsFocusGained" FocusLost="OnOptionsFocusLost" ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/c_basic_button_white_bg_normal.9.png" Border="4,4,5,5" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent" >
+            <ImageView Name="Options3" CellIndex="0,2" Focusable="true" FocusGained="OnOptionsFocusGained" FocusLost="OnOptionsFocusLost" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/c_basic_button_white_bg_normal.9.png" Border="4,4,5,5" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent" >
                 <TextLabel Text="Options" PointSize="25" HorizontalAlignment="Center" VerticalAlignment="Center" ParentOrigin="Center" PivotPoint="Center" PositionUsesPivotPoint="true" />
             </ImageView>
         </TableView>
diff --git a/test/NUITestSample/NUIXAMLTestSample/res/layout/1920x1080/SearchPage.xaml b/test/NUITestSample/NUIXAMLTestSample/res/layout/1920x1080/SearchPage.xaml
new file mode 100755 (executable)
index 0000000..f6ef732
--- /dev/null
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<AppDetailPage x:Class="Tizen.NUI.Examples.SearchPage"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
+    <View Name="UpperArea" BackgroundColor="Green" SizeWidth="1920" SizeHeight="332" ParentOrigin="TopLeft" PivotPoint="TopLeft" PositionY="30"  PositionUsesPivotPoint="true">
+        <TextLabel Text="TopResults" PointSize="25" SizeWidth="300" SizeHeight="50" PositionX="81" PositionY="0" />
+        <TableView Name="UpperListTable" Focusable="true" SizeWidth="1758" SizeHeight="250" PositionX="81" Rows="1" Columns="5" CellPadding="6,0" ParentOrigin="CenterLeft" PivotPoint="CenterLeft"  PositionUsesPivotPoint="true">
+            <ImageView Name="listItem11" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/youtube/ytb01.png" CellIndex="0,0" Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent" PivotPoint="CenterLeft"/>
+            <ImageView Name="listItem12" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/youtube/ytb02.png" CellIndex="0,1" Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent"/>
+            <ImageView Name="listItem13" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/youtube/ytb03.png" CellIndex="0,2" Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent"/>
+            <ImageView Name="listItem14" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/youtube/ytb04.png" CellIndex="0,3" Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent"/>
+            <ImageView Name="listItem15" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/youtube/ytb05.png" CellIndex="0,4" Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent"/>
+        </TableView>
+    </View>
+    <View Name="MidArea" BackgroundColor="Green" SizeWidth="1920" SizeHeight="332" ParentOrigin="TopLeft" PivotPoint="TopLeft" PositionY="390"  PositionUsesPivotPoint="true">
+        <TextLabel Text="Youtube" PointSize="25" SizeWidth="300" SizeHeight="50" PositionX="81" PositionY="0" />
+        <TableView Name="MidListTable" Focusable="true" SizeWidth="1758" SizeHeight="250" PositionX="81" Rows="1" Columns="5" CellPadding="6,0" ParentOrigin="CenterLeft" PivotPoint="CenterLeft"  PositionUsesPivotPoint="true">
+            <ImageView Name="listItem21" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/youtube/ytb06.png" CellIndex="0,0" Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent" PivotPoint="CenterLeft"/>
+            <ImageView Name="listItem22" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/youtube/ytb07.png" CellIndex="0,1" Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent"/>
+            <ImageView Name="listItem23" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/youtube/ytb08.png" CellIndex="0,2" Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent"/>
+            <ImageView Name="listItem24" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/youtube/ytb09.png" CellIndex="0,3" Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent"/>
+            <ImageView Name="listItem25" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/youtube/ytb010.png" CellIndex="0,4" Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent"/>
+        </TableView>
+    </View>
+    <View Name="BottomArea" BackgroundColor="Green" SizeWidth="1920" SizeHeight="332" ParentOrigin="TopLeft" PivotPoint="TopLeft" PositionY="748"  PositionUsesPivotPoint="true">
+        <TextLabel Text="Facebook" PointSize="25" SizeWidth="300" SizeHeight="50" PositionX="81" PositionY="0" />
+        <TableView Name="BottomListTable" Focusable="true" SizeWidth="1758" SizeHeight="250" PositionX="81" Rows="1" Columns="5" CellPadding="6,0" ParentOrigin="CenterLeft" PivotPoint="CenterLeft"  PositionUsesPivotPoint="true">
+            <ImageView Name="listItem31" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/youtube/ytb011.png" CellIndex="0,0" Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent" PivotPoint="CenterLeft"/>
+            <ImageView Name="listItem32" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/youtube/ytb012.png" CellIndex="0,1" Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent"/>
+            <ImageView Name="listItem33" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/youtube/ytb013.png" CellIndex="0,2" Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent"/>
+            <ImageView Name="listItem34" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/youtube/ytb014.png" CellIndex="0,3" Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent"/>
+            <ImageView Name="listItem35" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/youtube/ytb015.png" CellIndex="0,4" Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent"/>
+        </TableView>
+    </View>
+</AppDetailPage>
diff --git a/test/NUITestSample/NUIXAMLTestSample/res/layout/1920x1080/WeatherPage.xaml b/test/NUITestSample/NUIXAMLTestSample/res/layout/1920x1080/WeatherPage.xaml
new file mode 100755 (executable)
index 0000000..4cf3c6b
--- /dev/null
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ContentPage x:Class="Tizen.NUI.Examples.WeatherPage"
+  xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
+
+  <ImageView Name="title" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/weather/up.bmp" Position2D="53,0" Size2D="1867,461" />
+  <ImageView Name="left" ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/weather/left.bmp" Position2D="0,0" Size2D="53,1079" />
+  <View Name="content" Size2D="1920,1080" Position2D="0,0" BackgroundColor="0,0,0,0">
+     <TableView  Name="ListTable" Focusable="true" SizeWidth="1758" SizeHeight="360" PositionX="81" PositionY="560" Rows="1" Columns="5" CellPadding="33.8,0">
+            <ImageView ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/weather/current.bmp" CellIndex="0,0" Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent" />
+            <ImageView ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/weather/1.bmp" CellIndex="0,1" Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent" />
+            <ImageView ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/weather/2.bmp" CellIndex="0,2" Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent" />
+            <ImageView ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/weather/3.bmp" CellIndex="0,3" Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent" />
+            <ImageView ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/weather/4.bmp" CellIndex="0,4" Focusable="true" FocusGained="OnFocusGained" FocusLost="OnFocusLost" WidthResizePolicy="FillToParent" HeightResizePolicy="FillToParent" />
+     </TableView>
+  </View>
+</ContentPage>
@@ -1,19 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ContentPage x:Class="Tizen.NUI.Examples.ButtonTestPage"
   xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:l="clr-namespace:Tizen.NUI;assembly=Tizen.NUI"
   xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
       <PushButton PositionX="10" PositionY="10" LabelText="PushButton" ForegroundVisualPadding="40,5,22,22" LabelPadding="5,40,22,22" Togglable="true" Size2D="260, 84" Clicked="OnClicked" Pressed="OnPressed" Released="OnReleased" LabelRelativeAlignment="End" >
         <PushButton.UnselectedVisual>
           <PropertyMap>
             <KeyValue Key="Visual.Property.Type" Value="{VisualType Image}" />
-            <KeyValue Key="ImageVisualProperty.URL" Value="{x:String /home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/star-highlight.png}" />
+            <KeyValue Key="ImageVisualProperty.URL" Value="{x:String /home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/star-highlight.png}" />
           </PropertyMap>
         </PushButton.UnselectedVisual>
         <PushButton.SelectedVisual>
           <PropertyMap>
             <KeyValue Key="Visual.Property.Type" Value="{VisualType Image}" />
-            <KeyValue Key="ImageVisualProperty.URL" Value="{x:String /home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/star-mod.png}" />
+            <KeyValue Key="ImageVisualProperty.URL" Value="{x:String /home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/star-mod.png}" />
           </PropertyMap>
         </PushButton.SelectedVisual>
         <!-- <PushButton.DisabledSelectedVisual>
         <PushButton.UnselectedBackgroundVisual>
           <PropertyMap>
             <KeyValue Key="Visual.Property.Type" Value="{VisualType NPatch}" />
-            <KeyValue Key="NpatchImageVisualProperty.URL" Value="{x:String /home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/c_basic_button_white_bg_normal.9.png}" />
+            <KeyValue Key="NpatchImageVisualProperty.URL" Value="{x:String /home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/c_basic_button_white_bg_normal.9.png}" />
             <KeyValue Key="NpatchImageVisualProperty.Border" RectangleValue="4,4,5,5" />
           </PropertyMap>
         </PushButton.UnselectedBackgroundVisual>
         <PushButton.SelectedBackgroundVisual>
           <PropertyMap>
             <KeyValue Key="Visual.Property.Type" Value="{VisualType NPatch}" />
-            <KeyValue Key="NpatchImageVisualProperty.URL" Value="{x:String /home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/r_highlight_bg_focus_9patch.png}" />
+            <KeyValue Key="NpatchImageVisualProperty.URL" Value="{x:String /home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/r_highlight_bg_focus_9patch.png}" />
             <KeyValue Key="NpatchImageVisualProperty.Border" RectangleValue="14,14,20,20" />
           </PropertyMap>
         </PushButton.SelectedBackgroundVisual>
@@ -58,9 +57,9 @@
       <ToggleButton PositionX="10" PositionY="630" Size2D="50, 50" CurrentStateIndex="1">
         <ToggleButton.StateVisuals>
           <PropertyArray>
-            <KeyValue Value="{x:String /home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/star-highlight.png}" />
-            <KeyValue Value="{x:String /home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/star-mod.png}" />
-            <KeyValue Value="{x:String /home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/star-dim.png}" />
+            <KeyValue Value="{x:String /home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/star-highlight.png}" />
+            <KeyValue Value="{x:String /home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/star-mod.png}" />
+            <KeyValue Value="{x:String /home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/star-dim.png}" />
           </PropertyArray>
         </ToggleButton.StateVisuals>
         <ToggleButton.Tooltips>
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ContentPage x:Class="Tizen.NUI.Examples.FlexContainerPage"
   xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:l="clr-namespace:Tizen.UI_Xaml;assembly=Tizen.UI_Xaml"
   xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
 
     <FlexContainer BackgroundColor="Red" SizeWidth="470" SizeHeight="500" PositionX="5" PositionY="100" FlexDirection="Row" ContentDirection="LTR" FlexWrap="Wrap" JustifyContent="JustifyFlexStart">
@@ -1,19 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ContentPage x:Class="Tizen.NUI.Examples.ImageTestPage"
   xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:l="clr-namespace:Tizen.UI_Xaml;assembly=Tizen.UI_Xaml"
   xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
 
-      <ImageView ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/gallery-0.jpg" 
+      <ImageView ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/gallery-0.jpg" 
         PositionX="10" PositionY="10" Size2D="300, 300" ResourceReady="OnResourceReady" />
       <ImageView PositionX="10" PositionY="320" Size2D="300, 300" PixelArea="0.1,0.0,0.4,0.6" >
         <ImageView.Image>
           <PropertyMap>
             <KeyValue Key="Visual.Property.Type" Value="{VisualType Image}" />
-            <KeyValue Key="ImageVisualProperty.URL" Value="{x:String /home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/gallery-0.jpg}" />
+            <KeyValue Key="ImageVisualProperty.URL" Value="{x:String /home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/gallery-0.jpg}" />
           </PropertyMap>
         </ImageView.Image>
       </ImageView>
-      <ImageView ResourceUrl="/home/tengxb/GitRepo/nui-xaml/TestXaml/res/images/00_popup_bg.9.png" 
+      <ImageView ResourceUrl="/home/owner/apps_rw/org.tizen.example.NUIXAMLTestSample/res/images/00_popup_bg.9.png" 
         PositionX="10" PositionY="630" Size2D="300, 160" SynchronosLoading="true" />
 </ContentPage>
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ContentPage x:Class="Tizen.NUI.Examples.ScrollBarTestPage"
   xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:l="clr-namespace:Tizen.UI_Xaml;assembly=Tizen.UI_Xaml"
   xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
 
       <ScrollBar BackgroundColor="Green" ScrollDirection="Horizontal" Size2D="400,80" PositionY="50" ParentOrigin="TopLeft" PivotPoint="TopLeft" PositionUsesPivotPoint="true" />
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ContentPage x:Class="Tizen.NUI.Examples.SliderTestPage"
   xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:l="clr-namespace:Tizen.UI_Xaml;assembly=Tizen.UI_Xaml"
   xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
 
       <Slider BackgroundColor="Green" Value="10.1" PositionY="50" ParentOrigin="TopLeft" PivotPoint="TopLeft" PositionUsesPivotPoint="true"/>
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ContentPage x:Class="Tizen.NUI.Examples.TableTestPage"
   xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:l="clr-namespace:Tizen.UI_Xaml;assembly=Tizen.UI_Xaml"
   xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
 
     <TableView BackgroundColor="Red" SizeWidth="300" SizeHeight="100" PositionX="50" PositionY="100" Rows="2" Columns="2">
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ContentPage x:Class="Tizen.NUI.Examples.TextEditorTestPage"
   xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:l="clr-namespace:Tizen.UI_Xaml;assembly=Tizen.UI_Xaml"
   xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
 
       <TextEditor BackgroundColor="Red" Text="Text1" PositionX="10" PositionY="10" Size2D="460,200" ParentOrigin="TopLeft" PivotPoint="TopLeft" PositionUsesPivotPoint="true"/>
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ContentPage x:Class="Tizen.NUI.Examples.TextFieldTestPage"
   xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:l="clr-namespace:Tizen.UI_Xaml;assembly=Tizen.UI_Xaml"
   xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
 
       <TextField BackgroundColor="Red" Text="Text1" PositionX="10"  PositionY="50" 
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ContentPage x:Class="Tizen.NUI.Examples.TextLabelTestPage"
   xmlns="http://tizen.org/Tizen.NUI/2018/XAML"
-  xmlns:l="clr-namespace:Tizen.UI_Xaml;assembly=Tizen.UI_Xaml"
   xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
 
       <TextLabel BackgroundColor="Green" Text="Text1" TextColor="Red" PositionY="50" ParentOrigin="TopLeft" PivotPoint="TopLeft" PositionUsesPivotPoint="true"/>