Merge "Add ThemeOverlay() API in Elementary." into devel/dotnet

diff --combined src/ElmSharp/ElmSharp/Elementary.cs
index 051a91f,7b59ed6..42ba886
mode 100644,100755..100644
--- 1/src/ElmSharp/ElmSharp/Elementary.cs
--- 2/src/ElmSharp/ElmSharp/Elementary.cs
+++ b/src/ElmSharp/ElmSharp/Elementary.cs
@@@ -1,19 -1,3 +1,19 @@@
 +/*
 + * Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
 + *
 + * Licensed under the Apache License, Version 2.0 (the License);
 + * you may not use this file except in compliance with the License.
 + * You may obtain a copy of the License at
 + *
 + * http://www.apache.org/licenses/LICENSE-2.0
 + *
 + * Unless required by applicable law or agreed to in writing, software
 + * distributed under the License is distributed on an AS IS BASIS,
 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 + * See the License for the specific language governing permissions and
 + * limitations under the License.
 + */
 +
  using System;
  using System.IO;
  
@@@ -26,10 -10,6 +26,6 @@@ namespace ElmShar
          public static void Initialize()
          {
              Interop.Elementary.elm_init(0, null);
-             if (File.Exists(_themeFilePath))
-             {
-                 Interop.Elementary.elm_theme_overlay_add(IntPtr.Zero, _themeFilePath);
-             }
          }
  
          public static void Shutdown()
@@@ -42,6 -22,14 +38,14 @@@
              Interop.Elementary.elm_run();
          }
  
+         public static void ThemeOverlay()
+         {
+             if (File.Exists(_themeFilePath))
+             {
+                 Interop.Elementary.elm_theme_overlay_add(IntPtr.Zero, _themeFilePath);
+             }
+         }
+ 
          public static double GetSystemScrollFriction()
          {
              return Interop.Elementary.elm_config_scroll_bring_in_scroll_friction_get();

diff --combined test/ElmSharp.Test/TestRunner.cs
index a306469,47dac8b..9bee255
--- 1/test/ElmSharp.Test/TestRunner.cs
--- 2/test/ElmSharp.Test/TestRunner.cs
+++ b/test/ElmSharp.Test/TestRunner.cs
@@@ -1,18 -1,10 +1,18 @@@
 -// Copyright 2016 by Samsung Electronics, Inc.,
 -//
 -// This software is the confidential and proprietary information
 -// of Samsung Electronics, Inc. ("Confidential Information"). You
 -// shall not disclose such Confidential Information and shall use
 -// it only in accordance with the terms of the license agreement
 -// you entered into with Samsung.
 +/*
 + * Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
 + *
 + * Licensed under the Apache License, Version 2.0 (the License);
 + * you may not use this file except in compliance with the License.
 + * You may obtain a copy of the License at
 + *
 + * http://www.apache.org/licenses/LICENSE-2.0
 + *
 + * Unless required by applicable law or agreed to in writing, software
 + * distributed under the License is distributed on an AS IS BASIS,
 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 + * See the License for the specific language governing permissions and
 + * limitations under the License.
 + */
  
  using System;
  using System.IO;
@@@ -48,6 -40,7 +48,7 @@@ namespace ElmSharp.Tes
              ResourceDir = Path.Combine(Path.GetDirectoryName(typeof(TestRunner).GetTypeInfo().Assembly.Location), "res");
  
              Elementary.Initialize();
+             Elementary.ThemeOverlay();
  
              EcoreSynchronizationContext.Initialize();