From: dongsug.song <dongsug.song@samsung.com>
Date: Tue, 25 Jul 2017 01:42:45 +0000 (+0900)
Subject: Revert "[Tizen] widget-view, animated-gif test codes are added"
X-Git-Tag: preview1-00180^2~176
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b466a4cc2eca994dc88678510267e1541f4db1c8;p=platform%2Fcore%2Fcsapi%2Ftizenfx.git

Revert "[Tizen] widget-view, animated-gif test codes are added"

This reverts commit fcc34e78a79aee9ac9d2a9d8addc8bb152b5e2e1.

Change-Id: I88e8310429113a14223cd93966e02d7630e94214
---

diff --git a/NUISamples/NUISamples.sln b/NUISamples/NUISamples.sln
index af1ae68..af8ea84 100755
--- a/NUISamples/NUISamples.sln
+++ b/NUISamples/NUISamples.sln
@@ -1,9 +1,16 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26430.14
+# Visual Studio 14
+VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NUISamples-dummy", "NUISamples\NUISamples\NUISamples-dummy.csproj", "{56CA3B27-C662-4AC8-93CA-7ACEF926B2AA}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NUISamples.TizenTV", "NUISamples\NUISamples.TizenTV\NUISamples.TizenTV.csproj", "{7731BE98-0A68-49A9-877C-A30A0D30D9F6}"
+	ProjectSection(ProjectDependencies) = postProject
+		{56CA3B27-C662-4AC8-93CA-7ACEF926B2AA} = {56CA3B27-C662-4AC8-93CA-7ACEF926B2AA}
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tizen.NUI", "..\Tizen.NUI\Tizen.NUI.csproj", "{F03A3B48-9D9B-4BF3-92CE-BD63CADC3CD3}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -11,10 +18,18 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{56CA3B27-C662-4AC8-93CA-7ACEF926B2AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{56CA3B27-C662-4AC8-93CA-7ACEF926B2AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{56CA3B27-C662-4AC8-93CA-7ACEF926B2AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{56CA3B27-C662-4AC8-93CA-7ACEF926B2AA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7731BE98-0A68-49A9-877C-A30A0D30D9F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7731BE98-0A68-49A9-877C-A30A0D30D9F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7731BE98-0A68-49A9-877C-A30A0D30D9F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7731BE98-0A68-49A9-877C-A30A0D30D9F6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F03A3B48-9D9B-4BF3-92CE-BD63CADC3CD3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F03A3B48-9D9B-4BF3-92CE-BD63CADC3CD3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F03A3B48-9D9B-4BF3-92CE-BD63CADC3CD3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F03A3B48-9D9B-4BF3-92CE-BD63CADC3CD3}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/NUISamples.TizenTV.csproj b/NUISamples/NUISamples/NUISamples.TizenTV/NUISamples.TizenTV.csproj
index ade8854..2442cfc 100755
--- a/NUISamples/NUISamples/NUISamples.TizenTV/NUISamples.TizenTV.csproj
+++ b/NUISamples/NUISamples/NUISamples.TizenTV/NUISamples.TizenTV.csproj
@@ -71,7 +71,6 @@
     <Compile Include="examples\relative-vector.cs" />
     <Compile Include="examples\scroll-view.cs" />
     <Compile Include="examples\sibling-order-test.cs" />
-    <Compile Include="examples\widget-view-test.cs" />
     <Compile Include="examples\test1.cs" />
     <Compile Include="examples\text-test.cs" />
     <Compile Include="examples\ttsplayer-test.cs" />
@@ -84,7 +83,6 @@
     <Compile Include="examples\visual-view-test2.cs" />
     <Compile Include="examples\visual-view-test.cs" />
     <Compile Include="examples\visual-view-test3.cs" />
-    <Compile Include="examples\visuals-example.cs" />
     <Compile Include="examples\visuals-using-custom-view\ContactData.cs" />
     <Compile Include="examples\visuals-using-custom-view\ContactView.cs" />
     <Compile Include="examples\visuals-using-custom-view\visuals-using-custom-view.cs" />
@@ -94,21 +92,16 @@
     <Folder Include="lib\" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="res\images\anim-gif\0.gif" />
-    <Content Include="res\images\anim-gif\1.gif" />
-    <Content Include="res\images\anim-gif\10.gif" />
-    <Content Include="res\images\anim-gif\11.gif" />
-    <Content Include="res\images\anim-gif\12.gif" />
-    <Content Include="res\images\anim-gif\13.gif" />
-    <Content Include="res\images\anim-gif\14.gif" />
-    <Content Include="res\images\anim-gif\2.gif" />
-    <Content Include="res\images\anim-gif\3.gif" />
-    <Content Include="res\images\anim-gif\4.gif" />
-    <Content Include="res\images\anim-gif\5.gif" />
-    <Content Include="res\images\anim-gif\6.gif" />
-    <Content Include="res\images\anim-gif\7.gif" />
-    <Content Include="res\images\anim-gif\8.gif" />
-    <Content Include="res\images\anim-gif\9.gif" />
+    <ProjectReference Include="..\..\..\Tizen.NUI\Tizen.NUI.csproj">
+      <Project>{f03a3b48-9d9b-4bf3-92ce-bd63cadc3cd3}</Project>
+      <Name>Tizen.NUI</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\NUISamples\NUISamples-dummy.csproj">
+      <Project>{56ca3b27-c662-4ac8-93ca-7acef926b2aa}</Project>
+      <Name>NUISamples-dummy</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
     <Content Include="res\images\application-icon-0.png" />
     <Content Include="res\images\background-blocks.jpg" />
     <Content Include="res\images\dali-logo-anim.gif" />
@@ -144,7 +137,6 @@
     <Content Include="res\images\image-3.jpg" />
     <Content Include="res\images\Kid1.svg" />
     <Content Include="res\images\Mail.svg" />
-    <Content Include="res\images\mask.png" />
     <Content Include="res\images\menu\0.png" />
     <Content Include="res\images\menu\1.png" />
     <Content Include="res\images\menu\2.png" />
@@ -180,11 +172,6 @@
     <Content Include="res\images\focuseffect\white-pixel.png" />
     <Content Include="res\images\World.svg" />
   </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Tizen.NUI">
-      <HintPath>..\..\..\..\..\..\..\..\..\GBS-BUILD\unified-arm\local\repos\unified.arm\armv7l\RPMS\Tizen.NUI.dll</HintPath>
-    </Reference>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
 		Other similar extension points exist, see Microsoft.Common.targets.
@@ -208,11 +195,11 @@
   <ProjectExtensions>
     <VisualStudio>
       <FlavorProperties GUID="{2F98DAC9-6F16-457B-AED7-D43CAC379341}" Configuration="Debug|Any CPU">
-        <ProjectCommonFlavorCfg />
+        <ProjectCorporateFlavorCfg />
       </FlavorProperties>
       <FlavorProperties GUID="{2F98DAC9-6F16-457B-AED7-D43CAC379341}" Configuration="Release|Any CPU">
-        <ProjectCommonFlavorCfg />
+        <ProjectCorporateFlavorCfg />
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/Main.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/Main.cs
index 0b75aff..17ca5fb 100755
--- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/Main.cs
+++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/Main.cs
@@ -39,8 +39,7 @@ namespace NUISamples.TizenTV.examples
             //new VisualsUsingCustomView.VisualsExample().Run(args);
             //new FirstScreen.FirstScreenApp().Run(args);
             //new VisualsExampleTest.Example().Run(args);
-            //new AsIsTest.Example().Run(args);
-            new WidgetViewTest.Example().Run(args);
+            new AsIsTest.Example().Run(args);
         }
     }
 }
diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/as-is-test-sample.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/as-is-test-sample.cs
index da94300..f9ea851 100755
--- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/as-is-test-sample.cs
+++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/as-is-test-sample.cs
@@ -49,7 +49,7 @@ namespace AsIsTest
 
         private void ObjectDumpTrigger()
         {
-            for (int i = 0; i < Window.LayerCount; i++)
+            for (int i = 0; i < Window.GetLayerCount(); i++)
             {
                 BFS(Window.GetLayer((uint)i), 1);
             }
@@ -84,7 +84,7 @@ namespace AsIsTest
                     Tizen.Log.Fatal("NUI-APP", string.Format("it is not TextLaebl"));
                 }
 
-                for (int i = 0; i < myView.ChildCount; i++)
+                for (int i = 0; i < myView.GetChildCount(); i++)
                 {
                     BFS(myView.GetChildAt((uint)i), depth + 1);
                 }
@@ -148,12 +148,12 @@ namespace AsIsTest
             layer.Add(vi2);
             layer.Add(tb3);
 
-            Window.Instance.AddLayer(layer);
+            Window.Instance.Add(layer);
         }
 
         void ObjectDumpTrigger2()
         {
-            uint layerCnt = Window.LayerCount;
+            uint layerCnt = Window.GetLayerCount();
             Tizen.Log.Fatal("NUI-APP", "layerCnt=" + layerCnt);
 
             for (uint i = 0; i < layerCnt; i++)
@@ -196,7 +196,7 @@ namespace AsIsTest
         {
             if (view)
             {
-                uint childCnt = view.ChildCount;
+                uint childCnt = view.GetChildCount();
                 if (childCnt > 0)
                 {
                     depth = depth + 1;
diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/date-picker-using-json/date-picker-using-json.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/date-picker-using-json/date-picker-using-json.cs
index 5344d55..a797434 100755
--- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/date-picker-using-json/date-picker-using-json.cs
+++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/date-picker-using-json/date-picker-using-json.cs
@@ -29,7 +29,7 @@ namespace DatePickerUsingJson
         private Spin _spinYear;  // spin control for year
         private Spin _spinMonth; // spin control for month
         private Spin _spinDay;   // spin control for day
-        //private Builder _builder; // DALi Builder
+        private Builder _builder; // DALi Builder
 
         //private const string _resPath = "/home/owner/apps_rw/NUISamples.TizenTV/res";
         private const string _resPath = "./res";  //for ubuntu
@@ -51,7 +51,7 @@ namespace DatePickerUsingJson
 
             //This is required for the Application which uses JSON theme and style of Dali builder
             ViewRegistryHelper.Initialize();
-            /*
+
             // load date JSON template...
             _builder = new Builder ();
 
@@ -89,10 +89,9 @@ namespace DatePickerUsingJson
 
             FocusManager keyboardFocusManager = FocusManager.Instance;
             keyboardFocusManager.PreFocusChange += OnKeyboardPreFocusChange;
-            //keyboardFocusManager.FocusedViewActivated += OnFocusedViewActivated;
+            keyboardFocusManager.FocusedViewActivated += OnFocusedViewActivated;
 
             StyleManager.Get().ApplyTheme(_resPath + "/json/date-picker-theme.json");
-            */
         }
 
         private View OnKeyboardPreFocusChange(object source, FocusManager.PreFocusChangeEventArgs e)
@@ -131,7 +130,7 @@ namespace DatePickerUsingJson
 
             return nextFocusView;
         }
-        /*
+
         private void OnFocusedViewActivated(object source, FocusManager.FocusedViewActivatedEventArgs e)
         {
             // Make the text field in the current focused spin to take the key input
@@ -159,7 +158,7 @@ namespace DatePickerUsingJson
                 }
             }
         }
-        */
+
 
         /// <summary>
         /// The main entry point for the application.
diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/flex-container.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/flex-container.cs
index f753255..2a6274b 100755
--- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/flex-container.cs
+++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/flex-container.cs
@@ -79,7 +79,7 @@ namespace FlexContainerTest
             };
 
             //added
-            Window.Instance.TouchEvent += (sender, e) =>
+            Window.Instance.Touched += (sender, e) =>
             {
                 Tizen.Log.Debug("NUI", "Window Touch signal callback! To avoid crash, when losing key focus, set here again unless the NextView is null");
                 FocusManager.Instance.SetCurrentFocusView(label[3]);
diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/gc-test.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/gc-test.cs
index 04c9b29..fb1f994 100755
--- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/gc-test.cs
+++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/gc-test.cs
@@ -239,18 +239,19 @@ namespace TizenVDUIApplication19
             //This function is called when the app exit normally.
             base.OnTerminate();
         }
-        /*
+
         protected override void OnLowMemory(LowMemoryEventArgs e)
         {
             //This function is called when the system is low on memory.
             base.OnLowMemory(e);
         }
+
         protected override void OnLocaleChanged(LocaleChangedEventArgs e)
         {
             //This function is called when the language is changed.
             base.OnLocaleChanged(e);
         }
-        */
+
         private static void _Main(string[] args)
         {
             //Create an Application
diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/hello-test.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/hello-test.cs
old mode 100755
new mode 100644
index e67995f..4145383
--- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/hello-test.cs
+++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/hello-test.cs
@@ -59,7 +59,7 @@ namespace HelloTest
         {
             // Connect the signal callback for window touched signal
             _window = Window.Instance;
-            _window.TouchEvent += OnWindowTouched;
+            _window.Touched += OnWindowTouched;
 
             // Add a _text label to the window
             _text = new TextLabel("Hello Mono World");
@@ -82,7 +82,7 @@ namespace HelloTest
         }
 
         // Callback for window touched signal handling
-        private void OnWindowTouched(object sender, Window.TouchEventArgs e)
+        private void OnWindowTouched(object sender, Window.TouchedEventArgs e)
         {
             // Only animate the _text label when touch down happens
             if (e.Touch.GetState(0) == PointStateType.Down)
diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/hello-world.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/hello-world.cs
index 58fbbe5..b4dd9e2 100755
--- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/hello-world.cs
+++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/hello-world.cs
@@ -53,12 +53,12 @@ namespace HelloWorldTest
         {
             Window window = Window.Instance;
             window.BackgroundColor = Color.White;
-            window.TouchEvent += OnWindowTouched;
-            window.KeyEvent += OnWindowKeyEvent;
+            window.Touched += OnWindowTouched;
+            window.KeyPressed += OnWindowKeyEvent;
             window.Resized += (obj, e) =>
             {
-                Tizen.Log.Debug("NUI", "Height: " + e.WindowSize.GetHeight());
-                Tizen.Log.Debug("NUI", "Width: " + e.WindowSize.GetWidth());
+                Tizen.Log.Debug("NUI", "Height: " + e.Height);
+                Tizen.Log.Debug("NUI", "Width: " + e.Width);
             };
 
             TextLabel pixelLabel = new TextLabel("Test Pixel Size 32.0f");
@@ -151,7 +151,7 @@ namespace HelloWorldTest
             }
         }
 
-        public void OnWindowTouched(object sender, Window.TouchEventArgs e)
+        public void OnWindowTouched(object sender, Window.TouchedEventArgs e)
         {
             if (e.Touch.GetState(0) == PointStateType.Down)
             {
diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/image-view.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/image-view.cs
index 97f974f..e119d29 100755
--- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/image-view.cs
+++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/image-view.cs
@@ -63,16 +63,16 @@ namespace ImageViewTest
             Log("Customized Application Initialize event handler");
             window = Window.Instance;
             window.BackgroundColor = Color.Cyan;
-            window.TouchEvent += OnWindowTouched;
-            window.WheelEvent += OnWindowWheelMoved;
-            window.KeyEvent += OnWindowKeyPressed;
+            window.Touched += OnWindowTouched;
+            window.WheelRolled += OnWindowWheelMoved;
+            window.KeyPressed += OnWindowKeyPressed;
             //window.EventProcessingFinished += OnWindowEventProcessingFinished;
 
             layer = window.GetDefaultLayer();
             _layer1 = new Layer();
             _layer2 = new Layer();
-            window.AddLayer(_layer1);
-            window.AddLayer(_layer2);
+            window.Add(_layer1);
+            window.Add(_layer2);
             Log("_layer1.Behavior =" + _layer1.Behavior);
             if (_layer1.Behavior == Layer.LayerBehavior.LayerUI)
             {
@@ -236,7 +236,7 @@ namespace ImageViewTest
             Log("state=" + e.Key.State);
         }
 
-        public void OnWindowWheelMoved(object sender, Window.WheelEventArgs e)
+        public void OnWindowWheelMoved(object sender, Window.WheelRolledEventArgs e)
         {
             Log("OnWindowWheelEventOccured()!");
             Log("direction=" + e.Wheel.Direction);
@@ -244,7 +244,7 @@ namespace ImageViewTest
         }
 
         // Callback for window touched signal handling
-        public void OnWindowTouched(object sender, Window.TouchEventArgs e)
+        public void OnWindowTouched(object sender, Window.TouchedEventArgs e)
         {
             Log("OnWindowTouched()! e.TouchData.GetState(0)=" + e.Touch.GetState(0));
         }
diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/relative-vector.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/relative-vector.cs
old mode 100755
new mode 100644
index eb27855..eaa8b7a
--- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/relative-vector.cs
+++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/relative-vector.cs
@@ -58,7 +58,7 @@ namespace RelativeVectorTest
         private void Initialize()
         {
             _window = Window.Instance;
-            _window.TouchEvent += OnWindowTouched;
+            _window.Touched += OnWindowTouched;
 
             _imageView = new ImageView();
             _imageView.ResourceUrl = resources+"/images/gallery-3.jpg";
@@ -70,7 +70,7 @@ namespace RelativeVectorTest
         }
 
         // Callback for window touched signal handling
-        private void OnWindowTouched(object sender, Window.TouchEventArgs e)
+        private void OnWindowTouched(object sender, Window.TouchedEventArgs e)
         {
             // Only animate the _text label when touch down happens
             if (e.Touch.GetState(0) == PointStateType.Down)
diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/scroll-view.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/scroll-view.cs
index 15eab91..4f4c45d 100755
--- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/scroll-view.cs
+++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/scroll-view.cs
@@ -137,7 +137,7 @@ namespace ScrollViewTest
       // Connect to the OnRelayout signal
       _scrollView.Relayout += OnScrollViewRelayout;
       //_scrollView.Touched += OnTouch;
-      _scrollView.WheelEvent += Onwheel;
+      _scrollView.WheelRolled += Onwheel;
       _scrollView.FocusGained += OnKey;
       _text = new TextLabel("View Touch Event Handler Test");
       _text.ParentOrigin = ParentOrigin.Center;
@@ -158,13 +158,13 @@ namespace ScrollViewTest
       Tizen.Log.Debug("NUI", "View Keyevent EVENT callback....");
     }
 
-    private bool Onwheel(object source, View.WheelEventArgs e)
+    private bool Onwheel(object source, View.WheelRolledEventArgs e)
     {
       Tizen.Log.Debug("NUI", "View Wheel EVENT callback....");
       return true;
     }
 
-    private bool OnTouch(object source, View.TouchEventArgs e)
+    private bool OnTouch(object source, View.TouchedEventArgs e)
     {
       Tizen.Log.Debug("NUI", "View TOUCH EVENT callback....");
 
diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/ttsplayer-test.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/ttsplayer-test.cs
index e0807ce..ba4f0ef 100755
--- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/ttsplayer-test.cs
+++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/ttsplayer-test.cs
@@ -50,12 +50,12 @@ namespace TTSPlayerTest
 
             ttsPlayer.StateChanged += (s, e) =>
             {
-                Tizen.Log.Debug("NUI", "TTS state changed!!!");
+                Tizen.Log.Debug("TTS state changed!!!");
             };
             ttsPlayer.Pause();
             ttsPlayer.Resume();
             ttsPlayer.Stop();
-            Tizen.Log.Debug("NUI", "TTS state: " + ttsPlayer.GetState());
+            Tizen.Log.Debug("TTS state: " + ttsPlayer.GetState());
         }
 
         [STAThread]
diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/user-alphafunction.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/user-alphafunction.cs
index f805af0..54f6891 100755
--- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/user-alphafunction.cs
+++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/user-alphafunction.cs
@@ -64,10 +64,10 @@ namespace UserAlphaFunctionTest
             Log("Initialize() is called!");
             Window window = Window.Instance;
             window.BackgroundColor = Color.White;
-            window.TouchEvent += OnWindowTouched;
-            window.TouchEvent += OnWindowTouched2;
+            window.Touched += OnWindowTouched;
+            window.Touched += OnWindowTouched2;
             //window.EventProcessingFinished += OnEventProcessingFinished;
-            window.WheelEvent += OnWindowWheelEvent;
+            window.WheelRolled += OnWindowWheelEvent;
 
             // Add a _text label to the window
             _text = new TextLabel("Hello Mono World");
@@ -150,7 +150,7 @@ namespace UserAlphaFunctionTest
         }
 
         // Callback for window touched signal handling
-        public void OnWindowTouched(object source, Window.TouchEventArgs e)
+        public void OnWindowTouched(object source, Window.TouchedEventArgs e)
         {
             // Only animate the _text label when touch down happens
             if (e.Touch.GetState(0) == PointStateType.Down)
@@ -166,7 +166,7 @@ namespace UserAlphaFunctionTest
         }
 
         // Callback for window touched signal handling
-        public void OnWindowTouched2(object source, Window.TouchEventArgs e)
+        public void OnWindowTouched2(object source, Window.TouchedEventArgs e)
         {
             Log("OnWindowTouched2() is called!state=" + e.Touch.GetState(0));
         }
@@ -176,7 +176,7 @@ namespace UserAlphaFunctionTest
             Log("OnEventProcessingFinished() is called!");
         }
 
-        public void OnWindowWheelEvent(object source, Window.WheelEventArgs e)
+        public void OnWindowWheelEvent(object source, Window.WheelRolledEventArgs e)
         {
             Log("OnWindowWheelEvent() is called!");
             //Log("OnWindowWheelEvent() is called!direction="+ e.WheelEvent.direction + " timeStamp=" + e.WheelEvent.timeStamp );
diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/view-navi-property.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/view-navi-property.cs
index ce68ed0..71f324d 100755
--- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/view-navi-property.cs
+++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/view-navi-property.cs
@@ -49,7 +49,7 @@ namespace MyCSharpExample
                 Window.Instance.Add(view[i]);
                 view[i].FocusGained += FocusNavigationSample_FocusGained;
                 view[i].FocusLost += FocusNavigationSample_FocusLost;
-                view[i].KeyEvent += FocusNavigationSample_KeyEvent;
+                view[i].Key += FocusNavigationSample_KeyEvent;
             }
 
             view[0].RightFocusableView = view[1];
@@ -60,10 +60,10 @@ namespace MyCSharpExample
             FocusManager.Instance.SetCurrentFocusView(view[0]);
             FocusManager.Instance.PreFocusChange += Instance_PreFocusChange;
 
-            Window.Instance.TouchEvent += Instance_Touch;
+            Window.Instance.Touched += Instance_Touch;
         }
 
-        private void Instance_Touch(object sender, Window.TouchEventArgs e)
+        private void Instance_Touch(object sender, Window.TouchedEventArgs e)
         {
             Tizen.Log.Debug("NUI", "window touched! set key focus as view[0]!");
             FocusManager.Instance.SetCurrentFocusView(view[0]);
diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-animation-test.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-animation-test.cs
index 39ea8f4..d175a11 100755
--- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-animation-test.cs
+++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-animation-test.cs
@@ -30,8 +30,8 @@ namespace VisaulAnimationExample
         private TextLabel _title;
         private PushButton _shadowButton;
         private bool _active = false;
-        private const string _resPath = "/home/owner/apps_rw/NUISamples.TizenTV/res";  //for tizen
-        //private const string _resPath = "./res";  //for ubuntu
+        //private const string _resPath = "/home/owner/apps_rw/NUISamples.TizenTV/res";
+        private const string _resPath = "./res";  //for ubuntu
 
         private Animation _animation1;
         private bool _transitionInProgress = false;
@@ -41,6 +41,18 @@ namespace VisaulAnimationExample
         private AnimatedImageVisual gifVisual;
         private ImageVisual _icon;
 
+        public Example() : base()
+        {
+        }
+
+        public Example(string stylesheet) : base(stylesheet)
+        {
+        }
+
+        public Example(string stylesheet, WindowMode windowMode) : base(stylesheet, windowMode)
+        {
+        }
+
         protected override void OnCreate()
         {
             base.OnCreate();
@@ -201,9 +213,14 @@ namespace VisaulAnimationExample
             {
                 Tizen.Log.Debug("NUI", "gif button clicked!");
                 cnt2++;
-                int gifNum = cnt2 % 15;
-                gifVisual.URL = _resPath + "/images/anim-gif/" + gifNum + ".gif";
-                gifButton.LabelText = "file:" + gifNum + ".gif";
+                if (cnt2 % 2 == 0)
+                {
+                    gifVisual.URL = _resPath + "/images/dali-logo-anim.gif";
+                }
+                else
+                {
+                    gifVisual.URL = _resPath + "/images/echo.gif";
+                }
                 return true;
             };
             contentLayout.AddChild(gifButton, new TableView.CellPosition(2, 1));
diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-view-test2.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-view-test2.cs
index 659e9ba..cad1003 100755
--- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-view-test2.cs
+++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-view-test2.cs
@@ -43,7 +43,7 @@ namespace VisualViewTest2
                 Window.Instance.Add(view[i]);
                 view[i].FocusGained += VisualSample_FocusGained;
                 view[i].FocusLost += VisualSample_FocusLost;
-                view[i].KeyEvent += VisualSample_KeyEvent;
+                view[i].Key += VisualSample_KeyEvent;
             }
 
             view[0].RightFocusableView = view[1];
@@ -137,9 +137,9 @@ namespace VisualViewTest2
                 "Enter - Change BG image\n";
             Window.Instance.Add(guide);
 
-            Window.Instance.KeyEvent += Instance_Key;
+            Window.Instance.KeyPressed += Instance_Key;
             FocusManager.Instance.SetCurrentFocusView(view[0]);
-            Window.Instance.TouchEvent += Instance_Touch;
+            Window.Instance.Touched += Instance_Touch;
             _window = Window.Instance;
             _window.FocusChanged += _window_WindowFocusChanged;
 
@@ -150,7 +150,7 @@ namespace VisualViewTest2
             Tizen.Log.Fatal("NUI", "window focus changed!() focus gained=" + e.FocusGained);
         }
 
-        private void Instance_Touch(object sender, Window.TouchEventArgs e)
+        private void Instance_Touch(object sender, Window.TouchedEventArgs e)
         {
             FocusManager.Instance.SetCurrentFocusView(view[0]);
         }
diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/widget-view-test.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/widget-view-test.cs
deleted file mode 100755
index 9a2fbfa..0000000
--- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/widget-view-test.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-using System;
-using Tizen.NUI;
-using Tizen.NUI.UIComponents;
-using Tizen.NUI.BaseComponents;
-
-namespace WidgetViewTest
-{
-    class Example : NUIApplication
-    {
-        private PushButton _widgetButton;
-        private PushButton _deletedButton;
-        private WidgetView _widgetView;
-        private WidgetViewManager _widgetViewManager;
-        private View _container;
-        private string _instanceID;
-
-        protected override void OnCreate()
-        {
-            base.OnCreate();
-            Initialize();
-        }
-
-        protected override void OnTerminate()
-        {
-            //This function is called when the app exit normally.
-            base.OnTerminate();
-        }
-
-        public void Initialize()
-        {
-            Window window = Window.Instance;
-            window.BackgroundColor = Color.White;
-
-            Tizen.Log.Debug("NUI", "### DP1");
-            Layer layer = new Layer();
-            layer.Behavior = Layer.LayerBehavior.Layer3D;
-            window.AddLayer(layer);
-            Tizen.Log.Debug("NUI", "### DP2");
-            _container = new View();
-            _container.ParentOrigin = ParentOrigin.Center;
-            _container.PivotPoint = PivotPoint.Center;
-            _container.Size2D = new Size2D(400, 400);
-            Tizen.Log.Debug("NUI", "### DP3");
-            _widgetButton = new PushButton();
-            _widgetButton.LabelText = "Widget";
-            _widgetButton.ParentOrigin = ParentOrigin.BottomLeft;
-            _widgetButton.PivotPoint = PivotPoint.BottomLeft;
-            _widgetButton.PositionUsesAnchorPoint = true;
-            _widgetButton.Size2D = new Size2D(200, 100);
-            window.Add(_widgetButton);
-            _widgetButton.Clicked += (obj, e) =>
-            {
-                _widgetView = _widgetViewManager.AddWidget("widget-efl.example", "", 450, 700, -1);
-                //_widgetView.PositionUsesPivotPoint = true;
-                //_widgetView.ParentOrigin = ParentOrigin.Center;
-                _widgetView.PivotPoint = PivotPoint.TopLeft;
-                _widgetView.PositionUsesAnchorPoint = true;
-                _widgetView.BackgroundColor = Color.Yellow;
-                _widgetView.WidgetAdded += (sender, eargs) =>
-                {
-                    _widgetButton.LabelText = "Quit";
-                    window.Add(_widgetView);
-                };
-                _widgetView.WidgetDeleted += (sender, eargs) =>
-                {
-                    window.Remove(_widgetView);
-                    _widgetButton.LabelText = "Button";
-                };
-                _instanceID = _widgetView.InstanceID;
-                return false;
-            };
-
-            _deletedButton = new PushButton();
-            _deletedButton.LabelText = "Buton";
-            _deletedButton.ParentOrigin = ParentOrigin.BottomRight;
-            _deletedButton.PivotPoint = PivotPoint.BottomRight;
-            _deletedButton.PositionUsesAnchorPoint = true;
-            _deletedButton.Size2D = new Size2D(200, 100);
-            window.Add(_deletedButton);
-            _deletedButton.Clicked += (obj, e) =>
-            {
-                OnTerminate();
-                return true;
-            };
-
-            layer.Add(_container);
-            Tizen.Log.Debug("NUI", "### widget view manager create start");
-            _widgetViewManager = new WidgetViewManager(this, "org.tizen.example.NUISamples.TizenTV");
-            if (!_widgetViewManager)
-            {
-                Tizen.Log.Fatal("NUI", "### Widget is not enabled!");
-            }
-
-            Tizen.Log.Debug("NUI", "### widget view manager create sucess");
-        }
-
-        [STAThread]
-        static void _Main(string[] args)
-        {
-            Example example = new Example();
-            example.Run(args);
-        }
-    }
-}
-
diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/res/images/anim-gif/0.gif b/NUISamples/NUISamples/NUISamples.TizenTV/res/images/anim-gif/0.gif
deleted file mode 100755
index 9a085ba..0000000
Binary files a/NUISamples/NUISamples/NUISamples.TizenTV/res/images/anim-gif/0.gif and /dev/null differ
diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/res/images/anim-gif/1.gif b/NUISamples/NUISamples/NUISamples.TizenTV/res/images/anim-gif/1.gif
deleted file mode 100755
index c4cc65a..0000000
Binary files a/NUISamples/NUISamples/NUISamples.TizenTV/res/images/anim-gif/1.gif and /dev/null differ
diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/res/images/anim-gif/10.gif b/NUISamples/NUISamples/NUISamples.TizenTV/res/images/anim-gif/10.gif
deleted file mode 100755
index cc6d7a9..0000000
Binary files a/NUISamples/NUISamples/NUISamples.TizenTV/res/images/anim-gif/10.gif and /dev/null differ
diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/res/images/anim-gif/11.gif b/NUISamples/NUISamples/NUISamples.TizenTV/res/images/anim-gif/11.gif
deleted file mode 100755
index 354459a..0000000
Binary files a/NUISamples/NUISamples/NUISamples.TizenTV/res/images/anim-gif/11.gif and /dev/null differ
diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/res/images/anim-gif/12.gif b/NUISamples/NUISamples/NUISamples.TizenTV/res/images/anim-gif/12.gif
deleted file mode 100755
index a43380d..0000000
Binary files a/NUISamples/NUISamples/NUISamples.TizenTV/res/images/anim-gif/12.gif and /dev/null differ
diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/res/images/anim-gif/13.gif b/NUISamples/NUISamples/NUISamples.TizenTV/res/images/anim-gif/13.gif
deleted file mode 100755
index 0f649dd..0000000
Binary files a/NUISamples/NUISamples/NUISamples.TizenTV/res/images/anim-gif/13.gif and /dev/null differ
diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/res/images/anim-gif/14.gif b/NUISamples/NUISamples/NUISamples.TizenTV/res/images/anim-gif/14.gif
deleted file mode 100755
index 23e8199..0000000
Binary files a/NUISamples/NUISamples/NUISamples.TizenTV/res/images/anim-gif/14.gif and /dev/null differ
diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/res/images/anim-gif/2.gif b/NUISamples/NUISamples/NUISamples.TizenTV/res/images/anim-gif/2.gif
deleted file mode 100755
index c33ba6c..0000000
Binary files a/NUISamples/NUISamples/NUISamples.TizenTV/res/images/anim-gif/2.gif and /dev/null differ
diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/res/images/anim-gif/3.gif b/NUISamples/NUISamples/NUISamples.TizenTV/res/images/anim-gif/3.gif
deleted file mode 100755
index 5371a3e..0000000
Binary files a/NUISamples/NUISamples/NUISamples.TizenTV/res/images/anim-gif/3.gif and /dev/null differ
diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/res/images/anim-gif/4.gif b/NUISamples/NUISamples/NUISamples.TizenTV/res/images/anim-gif/4.gif
deleted file mode 100755
index ab60928..0000000
Binary files a/NUISamples/NUISamples/NUISamples.TizenTV/res/images/anim-gif/4.gif and /dev/null differ
diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/res/images/anim-gif/5.gif b/NUISamples/NUISamples/NUISamples.TizenTV/res/images/anim-gif/5.gif
deleted file mode 100755
index 68ec2f4..0000000
Binary files a/NUISamples/NUISamples/NUISamples.TizenTV/res/images/anim-gif/5.gif and /dev/null differ
diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/res/images/anim-gif/6.gif b/NUISamples/NUISamples/NUISamples.TizenTV/res/images/anim-gif/6.gif
deleted file mode 100755
index 288f933..0000000
Binary files a/NUISamples/NUISamples/NUISamples.TizenTV/res/images/anim-gif/6.gif and /dev/null differ
diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/res/images/anim-gif/7.gif b/NUISamples/NUISamples/NUISamples.TizenTV/res/images/anim-gif/7.gif
deleted file mode 100755
index 93ca68b..0000000
Binary files a/NUISamples/NUISamples/NUISamples.TizenTV/res/images/anim-gif/7.gif and /dev/null differ
diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/res/images/anim-gif/8.gif b/NUISamples/NUISamples/NUISamples.TizenTV/res/images/anim-gif/8.gif
deleted file mode 100755
index decc493..0000000
Binary files a/NUISamples/NUISamples/NUISamples.TizenTV/res/images/anim-gif/8.gif and /dev/null differ
diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/res/images/anim-gif/9.gif b/NUISamples/NUISamples/NUISamples.TizenTV/res/images/anim-gif/9.gif
deleted file mode 100755
index c97884b..0000000
Binary files a/NUISamples/NUISamples/NUISamples.TizenTV/res/images/anim-gif/9.gif and /dev/null differ
diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/tizen-manifest.xml b/NUISamples/NUISamples/NUISamples.TizenTV/tizen-manifest.xml
index a43ce60..a386df6 100755
--- a/NUISamples/NUISamples/NUISamples.TizenTV/tizen-manifest.xml
+++ b/NUISamples/NUISamples/NUISamples.TizenTV/tizen-manifest.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="NUISamples.TizenTV" version="1.0.0" api-version="3.0" xmlns="http://tizen.org/ns/packages">
-  <profile name="common" />
-  <ui-application appid="org.tizen.example.NUISamples.TizenTV" exec="NUISamples.TizenTV.exe" multiple="false" nodisplay="false" taskmanage="true" splash-screen-display="true" type="dotnet" launch_mode="single">
-    <label>NUISamples.TizenTV</label>
-    <icon>NUISamples.TizenTV.png</icon>
-  </ui-application>
-  <shortcut-list />
-  <privileges>
-    <privilege>http://tizen.org/privilege/appmanager.launch</privilege>
-    <privilege>http://tizen.org/privilege/widget.viewer</privilege>
-  </privileges>
+<manifest xmlns="http://tizen.org/ns/packages" api-version="3.0" package="NUISamples.TizenTV" version="1.0.0">
+	<profile name="common" />
+	<ui-application appid="org.tizen.example.NUISamples.TizenTV"
+					exec="NUISamples.TizenTV.exe"
+					type="dotnet"
+					multiple="false"
+					taskmanage="true"
+					nodisplay="false"
+					launch_mode="single">
+  <label>NUISamples.TizenTV</label>
+	<icon>NUISamples.TizenTV.png</icon>
+	</ui-application>
 </manifest>