From: admin <tizenapi@samsung.com>
Date: Tue, 14 Apr 2020 15:52:04 +0000 (+0000)
Subject: Merge remote-tracking branch 'origin/master' into tizen
X-Git-Tag: accepted/tizen/unified/20200416.080056~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=56f5a15293bc61911aaf64fa55d1b9de13bfab02;hp=b104b823c1d2c33b4ea7297227a414a7d47c223e;p=platform%2Fcore%2Fcsapi%2Ftizenfx.git

Merge remote-tracking branch 'origin/master' into tizen
---

diff --git a/src/Tizen.Applications.PackageManager/Tizen.Applications/PackageManager.cs b/src/Tizen.Applications.PackageManager/Tizen.Applications/PackageManager.cs
index 29bfc2d..df613b4 100755
--- a/src/Tizen.Applications.PackageManager/Tizen.Applications/PackageManager.cs
+++ b/src/Tizen.Applications.PackageManager/Tizen.Applications/PackageManager.cs
@@ -1193,33 +1193,43 @@ namespace Tizen.Applications
 
         private static void InternalEventCallback(string packageType, string packageId, Interop.PackageManager.EventType eventType, Interop.PackageManager.PackageEventState eventState, int progress, Interop.PackageManager.ErrorCode error, IntPtr user_data)
         {
+            PackageManagerEventArgs args;
             try
             {
+                args = new PackageManagerEventArgs(packageType, packageId, (PackageEventState)eventState, progress);
+            }
+            catch (Exception e)
+            {
+                Log.Warn(LogTag, e.Message);
+                return;
+            }
+
+            EventHandler<PackageManagerEventArgs> handlers = null;
+            lock (s_pkgEventLock)
+            {
                 if (eventType == Interop.PackageManager.EventType.Install)
                 {
-                    s_installEventHandler?.Invoke(null, new PackageManagerEventArgs(packageType, packageId, (PackageEventState)eventState, progress));
+                    handlers = s_installEventHandler;
                 }
                 else if (eventType == Interop.PackageManager.EventType.Uninstall)
                 {
-                    s_uninstallEventHandler?.Invoke(null, new PackageManagerEventArgs(packageType, packageId, (PackageEventState)eventState, progress));
+                    handlers = s_uninstallEventHandler;
                 }
                 else if (eventType == Interop.PackageManager.EventType.Update)
                 {
-                    s_updateEventHandler?.Invoke(null, new PackageManagerEventArgs(packageType, packageId, (PackageEventState)eventState, progress));
+                    handlers = s_updateEventHandler;
                 }
                 else if (eventType == Interop.PackageManager.EventType.Move)
                 {
-                    s_moveEventHandler?.Invoke(null, new PackageManagerEventArgs(packageType, packageId, (PackageEventState)eventState, progress));
+                    handlers = s_moveEventHandler;
                 }
                 else if (eventType == Interop.PackageManager.EventType.ClearData)
                 {
-                    s_clearDataEventHandler?.Invoke(null, new PackageManagerEventArgs(packageType, packageId, (PackageEventState)eventState, progress));
+                    handlers = s_clearDataEventHandler;
                 }
             }
-            catch (Exception e)
-            {
-                Log.Warn(LogTag, e.Message);
-            }
+
+            handlers?.Invoke(null, args);
         }
 
         private static void UnregisterPackageManagerEventIfNeeded()
diff --git a/src/Tizen.NUI.Components/Utils/StyleManager.cs b/src/Tizen.NUI.Components/Utils/StyleManager.cs
index e057cba..cf562ff 100755
--- a/src/Tizen.NUI.Components/Utils/StyleManager.cs
+++ b/src/Tizen.NUI.Components/Utils/StyleManager.cs
@@ -178,7 +178,7 @@ namespace Tizen.NUI.Components
         /// <since_tizen> 8 </since_tizen>
         public void RegisterComponentStyle(string targetTheme, Type component, Type style)
         {
-            if (targetTheme == null)
+            if (targetTheme == null || component == null || style == null)
             {
                 throw new ArgumentException("The argument targetTheme must be specified");
             }
diff --git a/src/Tizen.NUI/src/public/Layouting/LayoutGroup.cs b/src/Tizen.NUI/src/public/Layouting/LayoutGroup.cs
index e8862e9..c138812 100755
--- a/src/Tizen.NUI/src/public/Layouting/LayoutGroup.cs
+++ b/src/Tizen.NUI/src/public/Layouting/LayoutGroup.cs
@@ -106,10 +106,16 @@ namespace Tizen.NUI
                     {
                         if(childLayout.Owner != null)
                         {
-                            Interop.Actor.Actor_Remove(View.getCPtr(childLayout.Owner.Parent), View.getCPtr(childLayout.Owner));
-                            if (NDalicPINVOKE.SWIGPendingException.Pending)
-                                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-                            childLayout.Owner.InternalParent = null;
+                            View parent = childLayout.Owner.GetParent() as View;
+
+                            if(parent != null)
+                            {
+                                parent.RemoveChild(childLayout.Owner);
+                            }
+                            else
+                            {
+                                NUIApplication.GetDefaultWindow().Remove(childLayout.Owner);
+                            }
                         }
                     }
 
@@ -119,11 +125,13 @@ namespace Tizen.NUI
                     childRemoved = true;
                 }
             }
+
             if (childRemoved)
             {
                 // If child removed then set all siblings not being added to a ChangeOnRemove transition.
                 SetConditionsForAnimationOnLayoutGroup(TransitionCondition.ChangeOnRemove);
             }
+
             RequestLayout();
         }
 
diff --git a/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/DaliDemo/DaliDemo.cs b/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/DaliDemo/DaliDemo.cs
index 72f26fc..44fec3b 100755
--- a/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/DaliDemo/DaliDemo.cs
+++ b/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/DaliDemo/DaliDemo.cs
@@ -10,7 +10,7 @@ namespace Tizen.NUI.Samples
 {
     public class DaliDemo : NUIApplication
     {
-        public DaliDemo(string styleSheet) : base(styleSheet)
+        public DaliDemo(string styleSheet) : base(styleSheet, WindowMode.Transparent)
         {
         }
 
diff --git a/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/VideoViewTest.cs b/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/VideoViewTest.cs
index a42d5ff..6705dca 100755
--- a/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/VideoViewTest.cs
+++ b/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/VideoViewTest.cs
@@ -27,16 +27,17 @@ namespace Tizen.NUI.Samples
         myPlayer player;
         string resourcePath;
         const string tag = "NUITEST";
+        View dummy;
         public void Activate()
         {
             win = NUIApplication.GetDefaultWindow();
-            win.BackgroundColor = Color.Green;
+            win.BackgroundColor = new Color(1, 1, 1, 0);
             win.KeyEvent += Win_KeyEvent;
             win.TouchEvent += Win_TouchEvent;
 
-            var dummy = new View();
+            dummy = new View();
             dummy.Size = new Size(200, 200);
-            dummy.BackgroundColor = new Color(0.0f, 0.0f, 0.0f, 0.2f);
+            dummy.BackgroundColor = new Color(1, 1, 1, 0.5f);
             win.Add(dummy);
 
             resourcePath = Tizen.Applications.Application.Current.DirectoryInfo.Resource + "v.mp4";
@@ -49,9 +50,20 @@ namespace Tizen.NUI.Samples
         {
             win.KeyEvent -= Win_KeyEvent;
             win.TouchEvent -= Win_TouchEvent;
-            videoView?.Unparent();
-            player?.Dispose();
-            player = null;
+
+            tlog.Fatal(tag, $"Deactivate()!");
+
+            dummy.Unparent();
+
+            videoView.Unparent();
+
+            // currently it is crashed when Dispose() is called. need to check.
+            //videoView.Dispose();
+            //videoView = null;
+            //player.Unprepare();
+            //player.Dispose();
+            //player = null;
+            tlog.Fatal(tag, $"Deactivate()! videoView dispsed");
         }
 
         int cnt;