Change the app name : remove 'example'

Change-Id: Iabcb35f9850a75f9df043b428af71511b406e216

diff --git a/LibTVRefCommonPortable/Models/AppShortcutController.cs b/LibTVRefCommonPortable/Models/AppShortcutController.cs
index cb95eb8d769f6aa5a6792cc9ba19b5845bff482a..2db6baea6142c2bc5243de772775979ca2737f47 100755 (executable)
--- a/LibTVRefCommonPortable/Models/AppShortcutController.cs
+++ b/LibTVRefCommonPortable/Models/AppShortcutController.cs
@@ -93,7 +93,7 @@ namespace LibTVRefCommonPortable.Models
                 IconPath = "ic_tizen_home_list_allapps_normal.png",
                 Action = new AppControlAction
                 {
-                    AppID = "org.tizen.example.TVApps.TizenTV",
+                    AppID = "org.tizen.xaapps",
                 }
             };
 

diff --git a/LibTVRefCommonPortable/Utils/AppShortcutStorage.cs b/LibTVRefCommonPortable/Utils/AppShortcutStorage.cs
index 7daf948f386581e23beb5862b8e81c330099a744..010f33d6648d8fc5a249f0de977fc3b220949bf1 100644 (file)
--- a/LibTVRefCommonPortable/Utils/AppShortcutStorage.cs
+++ b/LibTVRefCommonPortable/Utils/AppShortcutStorage.cs
@@ -35,7 +35,7 @@ namespace LibTVRefCommonPortable.Utils
         /// A storage path.
         /// </summary>
         // TODO : Make this working properly, a accessing below directory is not permitted.
-        // private String storagePath = "/home/owner/apps_rw/TVHome.TizenTV/res/pinned_apps_info.xml";
+        // private String storagePath = "/home/owner/apps_rw/xahome/res/pinned_apps_info.xml";
         private static String storagePath = "/opt/usr/home/owner/share/pinned_apps_info.xml";
 
         /// <summary>

diff --git a/LibTVRefCommonTizen/Ports/AppControlPort.cs b/LibTVRefCommonTizen/Ports/AppControlPort.cs
index 51494a3f08dd8a99ecf6b03904e16dd98df15acb..403d8eb94e4a6d00a541e1313bc591fc598f4279 100644 (file)
--- a/LibTVRefCommonTizen/Ports/AppControlPort.cs
+++ b/LibTVRefCommonTizen/Ports/AppControlPort.cs
@@ -30,12 +30,12 @@ namespace LibTVRefCommonTizen.Ports
         /// The app ID of TV reference home application
         /// </summary>
         // TODO : change application later
-        public static string TVHomeAppID = "org.tizen.example.TVHome.TizenTV";
+        public static string TVHomeAppID = "org.tizen.xahome";
 
         /// <summary>
         /// The app ID of TV reference apps-tray application
         /// </summary>
-        public static string TVAppsAppID = "org.tizen.example.TVApps.TizenTV";
+        public static string TVAppsAppID = "org.tizen.xaapps";
 
         /// <summary>
         /// Represents the operation to be performed between TVHome and TVApps

diff --git a/TVApps/TVApps.TizenTV/TVApps.TizenTV.csproj b/TVApps/TVApps.TizenTV/TVApps.TizenTV.csproj
index 7ba8d8cd09b3aa242e949d0238c0fffcdca1fc9e..d0c6155463b7b40dccdc9ee3ce589968f6a52a6f 100644 (file)
--- a/TVApps/TVApps.TizenTV/TVApps.TizenTV.csproj
+++ b/TVApps/TVApps.TizenTV/TVApps.TizenTV.csproj
@@ -11,7 +11,7 @@
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>TVApps.TizenTV</RootNamespace>
-    <AssemblyName>TVApps.TizenTV</AssemblyName>
+    <AssemblyName>xaapps</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <DefaultLanguage>en-US</DefaultLanguage>
   </PropertyGroup>
@@ -44,7 +44,7 @@
   <ItemGroup>
     <None Include="TVApps.TizenTV.project.json" />
     <None Include="tizen-manifest.xml" />
-    <None Include="shared\res\TVApps.TizenTV.png" />
+    <None Include="shared\res\xaapps.png" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Renderer\CustomButtonRenderer.cs" />
@@ -93,10 +93,10 @@
   <ProjectExtensions>
     <VisualStudio>
       <FlavorProperties GUID="{2F98DAC9-6F16-457B-AED7-D43CAC379341}" Configuration="Debug|Any CPU">
-        <ProjectCorporateFlavorCfg />
+        <ProjectCommonFlavorCfg />
       </FlavorProperties>
       <FlavorProperties GUID="{2F98DAC9-6F16-457B-AED7-D43CAC379341}" Configuration="Release|Any CPU">
-        <ProjectCorporateFlavorCfg />
+        <ProjectCommonFlavorCfg />
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>

diff --git a/TVApps/TVApps.TizenTV/shared/res/TVApps.TizenTV.png b/TVApps/TVApps.TizenTV/shared/res/TVApps.TizenTV.png
deleted file mode 100644 (file)
index 9765b1b..0000000
Binary files a/TVApps/TVApps.TizenTV/shared/res/TVApps.TizenTV.png and /dev/null differ

diff --git a/TVApps/TVApps.TizenTV/shared/res/xaapps.png b/TVApps/TVApps.TizenTV/shared/res/xaapps.png
new file mode 100644 (file)
index 0000000..9765b1b
Binary files /dev/null and b/TVApps/TVApps.TizenTV/shared/res/xaapps.png differ

diff --git a/TVApps/TVApps.TizenTV/tizen-manifest.xml b/TVApps/TVApps.TizenTV/tizen-manifest.xml
index adb7c7a82838aa0298d7059dba86aa2fe434de5e..2b821a3ee1932903692e04825a6f2ddded81facc 100644 (file)
--- a/TVApps/TVApps.TizenTV/tizen-manifest.xml
+++ b/TVApps/TVApps.TizenTV/tizen-manifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="TVApps.TizenTV" version="1.0.0" api-version="3.0" xmlns="http://tizen.org/ns/packages">
-  <profile name="common" />
-  <ui-application appid="org.tizen.example.TVApps.TizenTV" exec="TVApps.TizenTV.exe" multiple="false" nodisplay="false" taskmanage="true" type="dotnet" launch_mode="single">
-    <icon>TVApps.TizenTV.png</icon>
+<manifest package="org.tizen.xaapps" version="1.0.0" api-version="3.0" xmlns="http://tizen.org/ns/packages">
+  <profile name="tv" />
+  <ui-application appid="org.tizen.xaapps" exec="xaapps.exe" multiple="false" nodisplay="false" taskmanage="true" splash-screen-display="true" type="dotnet" launch_mode="single">
+    <icon>xaapps.png</icon>
     <label>Apps</label>
   </ui-application>
   <shortcut-list />

diff --git a/TVHome/TVHome.TizenTV/TVHome.TizenTV.csproj b/TVHome/TVHome.TizenTV/TVHome.TizenTV.csproj
index 083a6217222071d3cef3122c079ddb122ed84e3b..d66660a78436a34951c0dcc9bac15cefd1179f62 100755 (executable)
--- a/TVHome/TVHome.TizenTV/TVHome.TizenTV.csproj
+++ b/TVHome/TVHome.TizenTV/TVHome.TizenTV.csproj
@@ -11,7 +11,7 @@
     <OutputType>Exe</OutputType>\r
     <AppDesignerFolder>Properties</AppDesignerFolder>\r
     <RootNamespace>TVHome.TizenTV</RootNamespace>\r
-    <AssemblyName>TVHome.TizenTV</AssemblyName>\r
+    <AssemblyName>xahome</AssemblyName>\r
     <FileAlignment>512</FileAlignment>\r
     <DefaultLanguage>en-US</DefaultLanguage>\r
   </PropertyGroup>\r
@@ -43,8 +43,10 @@
   </PropertyGroup>\r
   <ItemGroup>\r
     <None Include="TVHome.TizenTV.project.json" />\r
-    <None Include="tizen-manifest.xml" />\r
-    <None Include="shared\res\TVHome.TizenTV.png" />\r
+    <None Include="tizen-manifest.xml">\r
+      <ExcludeFromStyleCop>False</ExcludeFromStyleCop>\r
+    </None>\r
+    <None Include="shared\res\xahome.png" />\r
   </ItemGroup>\r
   <ItemGroup>\r
     <Compile Include="TVHome.TizenTV.cs" />\r
@@ -166,10 +168,10 @@
   <ProjectExtensions>\r
     <VisualStudio>\r
       <FlavorProperties GUID="{2F98DAC9-6F16-457B-AED7-D43CAC379341}" Configuration="Debug|Any CPU">\r
-        <ProjectCorporateFlavorCfg />\r
+        <ProjectCommonFlavorCfg />\r
       </FlavorProperties>\r
       <FlavorProperties GUID="{2F98DAC9-6F16-457B-AED7-D43CAC379341}" Configuration="Release|Any CPU">\r
-        <ProjectCorporateFlavorCfg />\r
+        <ProjectCommonFlavorCfg />\r
       </FlavorProperties>\r
     </VisualStudio>\r
   </ProjectExtensions>\r

diff --git a/TVHome/TVHome.TizenTV/shared/res/TVHome.TizenTV.png b/TVHome/TVHome.TizenTV/shared/res/TVHome.TizenTV.png
deleted file mode 100644 (file)
index 9765b1b..0000000
Binary files a/TVHome/TVHome.TizenTV/shared/res/TVHome.TizenTV.png and /dev/null differ

diff --git a/TVHome/TVHome.TizenTV/shared/res/xahome.png b/TVHome/TVHome.TizenTV/shared/res/xahome.png
new file mode 100644 (file)
index 0000000..9765b1b
Binary files /dev/null and b/TVHome/TVHome.TizenTV/shared/res/xahome.png differ

diff --git a/TVHome/TVHome.TizenTV/tizen-manifest.xml b/TVHome/TVHome.TizenTV/tizen-manifest.xml
index b214922a33c2fca6eab93dead8db225e0877f22d..544041f3afb8de4b2fe296f7b4c71036af11d5f7 100755 (executable)
--- a/TVHome/TVHome.TizenTV/tizen-manifest.xml
+++ b/TVHome/TVHome.TizenTV/tizen-manifest.xml
@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="TVHome.TizenTV" version="1.0.0" api-version="3.0" xmlns="http://tizen.org/ns/packages">
+<manifest package="org.tizen.xahome" version="1.0.0" api-version="3.0" xmlns="http://tizen.org/ns/packages">
+  <profile name="tv" />
+  <ui-application appid="org.tizen.xahome" exec="xahome.exe" multiple="false" nodisplay="false" taskmanage="true" splash-screen-display="true" type="dotnet" launch_mode="single">
+    <icon>xahome.png</icon>
+    <label>Home</label>
+  </ui-application>
+  <ui-application appid="org.tizen.xaapps" exec="xaapps.exe" multiple="false" nodisplay="true" taskmanage="false" splash-screen-display="true" type="dotnet" launch_mode="single">
+    <icon>xaapps.png</icon>
+    <label>Apps</label>
+  </ui-application>
+  <shortcut-list />
   <privileges>
     <privilege>http://tizen.org/privilege/bluetooth</privilege>
     <privilege>http://tizen.org/privilege/network.get</privilege>
@@ -10,26 +20,4 @@
     <privilege>http://tizen.org/privilege/externalstorage</privilege>
     <privilege>http://tizen.org/privilege/keygrab</privilege>
   </privileges>
-  <profile name="tv" />
-  <ui-application appid="org.tizen.example.TVHome.TizenTV"
-                  exec="TVHome.TizenTV.exe"
-                  multiple="false"
-                  nodisplay="true"
-                  taskmanage="true"
-                  type="dotnet"
-                  launch_mode="single">
-    <icon>TVHome.TizenTV.png</icon>
-    <label>Home</label>
-  </ui-application>
-  <ui-application appid="org.tizen.example.TVApps.TizenTV"
-                  exec="TVApps.TizenTV.exe"
-                  type="dotnet"
-                  multiple="false"
-                  taskmanage="false"
-                  nodisplay="true"
-                  launch_mode="single">
-    <icon>TVApps.TizenTV.png</icon>
-    <label>Apps</label>
-  </ui-application>
-  <shortcut-list />
 </manifest>

diff --git a/TVHome/TVHome/ViewModels/MainPageViewModel.cs b/TVHome/TVHome/ViewModels/MainPageViewModel.cs
index 44c64c47b0633a53a4bfe94542586a604b37e6ee..729850d732d70ace48fcf9b55f12c149f73b920e 100755 (executable)
--- a/TVHome/TVHome/ViewModels/MainPageViewModel.cs
+++ b/TVHome/TVHome/ViewModels/MainPageViewModel.cs
@@ -209,7 +209,7 @@ namespace TVHome.ViewModels
             string[] AppName = { "Recent", "Apps", "Settings" };
             // TODO : Revert this before release
             //string[] AppControlID = { "org.tizen.settings", "org.tizen.apps", "org.tizen.settings" };
-            string[] AppControlID = { "org.tizen.example.TVApps.TizenTV", "org.tizen.example.TVApps.TizenTV", "org.tizen.settings" };
+            string[] AppControlID = { "org.tizen.xaapps", "org.tizen.xaapps", "org.tizen.settings" };
             string[] AppDefaultIconPath = { "ic_tizen_home_menu_recent_normal.png", "ic_tizen_home_menu_apps_normal.png", "ic_tizen_home_menu_settings_normal.png" };
             string[] AppFocusedIconPath = { "ic_tizen_home_menu_recent_focused.png", "ic_tizen_home_menu_apps_focused.png", "ic_tizen_home_menu_settings_focused.png" };
             string[] AppSelectedIconPath = { "ic_tizen_home_menu_recent_selected.png", "ic_tizen_home_menu_apps_selected.png", "ic_tizen_home_menu_settings_selected.png" };

diff --git a/packaging/org.tizen.xahome.service b/packaging/org.tizen.xahome.service
index af2d1946f7ad4995188eefffea1840c7acf03350..1cab9921ec069fc584f2fc9e9078d99ad2ddcdb9 100644 (file)
--- a/packaging/org.tizen.xahome.service
+++ b/packaging/org.tizen.xahome.service
@@ -4,4 +4,4 @@ Requires=launchpad-process-pool.service
 After=launchpad-process-pool.service
 
 [Service]
-ExecStart=/bin/sh -c -l '/usr/bin/aul_test launch org.tizen.example.TVHome.TizenTV'
+ExecStart=/bin/sh -c -l '/usr/bin/aul_test launch org.tizen.xahome'

diff --git a/packaging/org.tizen.xahome.spec b/packaging/org.tizen.xahome.spec
index a488ee3d5694de6f0351839d784f82a2269e1e83..b9ab70d0ed07c21eba3578e8a0c41ed54b100daa 100644 (file)
--- a/packaging/org.tizen.xahome.spec
+++ b/packaging/org.tizen.xahome.spec
@@ -41,7 +41,7 @@ This is a container package which have preload TPK files
 
 %install
 mkdir -p %{buildroot}/%{preload_tpk_path}
-install TVHome/TVHome.TizenTV/bin/Debug/TVHome.TizenTV.tpk %{buildroot}/%{preload_tpk_path}/
+install xahome/xahome/bin/Debug/xahome.tpk %{buildroot}/%{preload_tpk_path}/
 #install --directory %{buildroot}%{_prefix}/lib/%{_servicedir}
 #install -m 0644 %{SOURCE1} %{buildroot}%{_prefix}/lib/%{_sysuserdir}
 #install -m 0644 %{SOURCE2} %{buildroot}%{_prefix}/lib/%{_sysuserdir}