[NUI][Non-ACR][Fix ManualTCT's sub app crash issue]

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

diff --git a/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/code/WidgetViewSample/WidgetViewSample.cs b/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/code/WidgetViewSample/WidgetViewSample.cs
index 44c954f..f26bf02 100755 (executable)
--- a/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/code/WidgetViewSample/WidgetViewSample.cs
+++ b/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/code/WidgetViewSample/WidgetViewSample.cs
@@ -17,6 +17,7 @@ namespace WidgetViewSample
         private PushButton _widgetPauseBtn = null;
         private PushButton _widgetResumeBtn = null;
         private PushButton _widgetResizeBtn = null;
+        private PushButton _widgetExitBtn = null;
         private Window _window = null;
         private float _pointSize = 30.0f;
 
@@ -109,11 +110,19 @@ namespace WidgetViewSample
             _widgetResizeBtn.Clicked += OnResizeBtnClicked;
             Tizen.Log.Fatal("NUIWidget", "Add button Resize");
 
+            _widgetExitBtn = new PushButton();
+            _widgetExitBtn.Label = CreateTextMap(_pointSize, "Exit");
+            _widgetExitBtn.Focusable = true;
+            _widgetExitBtn.WidthResizePolicy = ResizePolicyType.FillToParent;
+            _widgetExitBtn.HeightResizePolicy = ResizePolicyType.FillToParent;
+            _widgetExitBtn.Clicked += OnExitBtnClicked;
+
             _buttonContainer.AddChild(_widgetAddBtn, new TableView.CellPosition(0, 0));
             _buttonContainer.AddChild(_widgetPauseBtn, new TableView.CellPosition(0, 1));
             _buttonContainer.AddChild(_widgetResumeBtn, new TableView.CellPosition(1, 0));
             _buttonContainer.AddChild(_widgetDeleteBtn, new TableView.CellPosition(1, 1));
             _buttonContainer.AddChild(_widgetResizeBtn, new TableView.CellPosition(2, 0));
+            _buttonContainer.AddChild(_widgetExitBtn, new TableView.CellPosition(2, 1));
 
             FocusManager.Instance.PreFocusChange += OnPreFocusChange;
             FocusManager.Instance.SetCurrentFocusView(_buttonContainer);
@@ -248,6 +257,12 @@ namespace WidgetViewSample
             return true;
         }
 
+        public override void Exit()
+        {
+            _widgetExitBtn.Clicked -= OnExitBtnClicked;
+            base.Exit();
+        }
+
         private void OnWidgetContentUpdated(object sender, WidgetView.WidgetViewEventArgs e)
         {
             Tizen.Log.Fatal("NUIWidget", "Widget view content updated triggered");
@@ -337,6 +352,13 @@ namespace WidgetViewSample
             return true;
         }
 
+        private bool OnExitBtnClicked(object source, EventArgs e)
+        {
+            Exit();
+            Tizen.Log.Fatal("NUIWidget", "Widget view has been resized!");
+            return true;
+        }
+
         private void AddEventHandler()
         {
             if (_widgetView != null)

diff --git a/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/code/WidgetViewWearableSample/WidgetViewWearableSample.cs b/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/code/WidgetViewWearableSample/WidgetViewWearableSample.cs
index 4652bfb..9981fb1 100755 (executable)
--- a/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/code/WidgetViewWearableSample/WidgetViewWearableSample.cs
+++ b/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/code/WidgetViewWearableSample/WidgetViewWearableSample.cs
@@ -15,6 +15,7 @@ namespace WidgetViewSample
         private PushButton _widgetPauseBtn = null;
         private PushButton _widgetResumeBtn = null;
         private PushButton _widgetResizeBtn = null;
+        private PushButton _widgetExitBtn = null;
 
         private Window _window = null;
         private float _pointSize = 4.0f;
@@ -53,7 +54,7 @@ namespace WidgetViewSample
             _widgetDeleteBtn = new PushButton();
             _widgetDeleteBtn.Label = CreateTextMap(_pointSize, "Delete");
             _widgetDeleteBtn.Size2D = new Size2D(80, 30);
-            _widgetDeleteBtn.Position2D = new Position2D(-10, 52);
+            _widgetDeleteBtn.Position2D = new Position2D(-40, 52);
             _widgetDeleteBtn.Clicked += OnDeleteBtnClicked;
             _buttons.Add(_widgetDeleteBtn);
             Tizen.Log.Fatal("NUIWidget", "Add button delete");
@@ -79,15 +80,30 @@ namespace WidgetViewSample
             _widgetResizeBtn = new PushButton();
             _widgetResizeBtn.Label = CreateTextMap(_pointSize, "Resize");
             _widgetResizeBtn.Size2D = new Size2D(80, 30);
-            _widgetResizeBtn.Position2D = new Position2D(80, 52);
+            _widgetResizeBtn.Position2D = new Position2D(50, 52);
             _widgetResizeBtn.Focusable = true;
             _widgetResizeBtn.Clicked += OnResizeBtnClicked;
             _buttons.Add(_widgetResizeBtn);
             Tizen.Log.Fatal("NUIWidget", "Add button resume");
 
+            _widgetExitBtn = new PushButton();
+            _widgetExitBtn.Label = CreateTextMap(_pointSize, "Exit");
+            _widgetExitBtn.Size2D = new Size2D(80, 30);
+            _widgetExitBtn.Position2D = new Position2D(140, 52);
+            _widgetExitBtn.Focusable = true;
+            _widgetExitBtn.Clicked += OnExitBtnClicked;
+            _buttons.Add(_widgetExitBtn);
+
             Window.Instance.KeyEvent += AppBack;
         }
 
+        public override void Exit()
+        {
+            _widgetExitBtn.Clicked -= OnExitBtnClicked;
+            Window.Instance.KeyEvent -= AppBack;
+            base.Exit();
+        }
+
         /// <summary>
         /// This Application will be exited when back key entered.
         /// </summary>
@@ -295,6 +311,12 @@ namespace WidgetViewSample
 
             return true;
         }
+
+        private bool OnExitBtnClicked(object source, EventArgs e)
+        {
+            Exit();
+            return true;
+        }
         private void AddEventHandler()
         {
             if (_widgetView != null)

diff --git a/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/org.tizen.example.WidgetViewSample-1.0.0.tpk b/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/org.tizen.example.WidgetViewSample-1.0.0.tpk
index e549ec3..a11ce20 100755 (executable)
Binary files a/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/org.tizen.example.WidgetViewSample-1.0.0.tpk and b/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/org.tizen.example.WidgetViewSample-1.0.0.tpk differ

diff --git a/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/org.tizen.example.WidgetViewWearableSample-1.0.0.tpk b/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/org.tizen.example.WidgetViewWearableSample-1.0.0.tpk
index 6fbee68..fa55bf1 100755 (executable)
Binary files a/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/org.tizen.example.WidgetViewWearableSample-1.0.0.tpk and b/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/org.tizen.example.WidgetViewWearableSample-1.0.0.tpk differ