Change package name with profile name.

[Issue]
Wearable profile image happened to use mobile accessibility-setting
and got a crash because the package name is same.

[Solution]
Change package name to org.tizen.accessibility-setting-wearable
from org.tizen.accessibility-setting to distinguish package name.

Change-Id: I401ab234c02f7d6c8c9107e874a1baf1a01ca364

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 93e6ec14500cf4a3991b80ec12d89dfb5d280f76..0d70483f90ebdd421678cf072cd10a5375c83773 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-PROJECT(accessibility-setting C)
+PROJECT(accessibility-setting-wearable C)
 
 SET(HEADERS)
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
@@ -80,4 +80,4 @@ INSTALL(FILES ${CMAKE_BINARY_DIR}/${PROJECT_NAME}.edj DESTINATION ${EDJDIR})
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/${PKGNAME}.xml DESTINATION ${TZ_SYS_RO_PACKAGES})
 
 # i18n
-ADD_SUBDIRECTORY(po)
\ No newline at end of file
+ADD_SUBDIRECTORY(po)

diff --git a/data/edc/accessibility-setting-wearable.edc b/data/edc/accessibility-setting-wearable.edc
new file mode 100644 (file)
index 0000000..42edd68
--- /dev/null
+++ b/data/edc/accessibility-setting-wearable.edc
@@ -0,0 +1,40 @@
+collections {
+
+       base_scale: 1.3;
+
+       group { name: "setting/genlist/layout";
+               parts {
+                       part {
+                               name: "bg";
+                               type: RECT;
+                               scale: 1;
+                               description {
+                                       state: "default" 0.0;
+                                       color: 0 0 0 255;
+                                       rel1 {
+                                               relative: 0.0 0.0;
+                                       }
+                                       rel2 {
+                                               relative: 1.0 1.0;
+                                       }
+                               }
+                       }
+                       part {
+                               name: "elm.genlist";
+                               type: SWALLOW;
+                               scale: 1;
+                               description {
+                                       state: "default" 0.0;
+                                       rel1 {
+                                               relative: 0.0 0.0;
+                                               to: "bg";
+                                       }
+                                       rel2 {
+                                               relative: 1.0 1.0;
+                                               to: "bg";
+                                       }
+                               }
+                       }
+               }
+       }
+}
\ No newline at end of file

diff --git a/data/edc/accessibility-setting.edc b/data/edc/accessibility-setting.edc
deleted file mode 100644 (file)
index 42edd68..0000000
--- a/data/edc/accessibility-setting.edc
+++ /dev/null
@@ -1,40 +0,0 @@
-collections {
-
-       base_scale: 1.3;
-
-       group { name: "setting/genlist/layout";
-               parts {
-                       part {
-                               name: "bg";
-                               type: RECT;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       color: 0 0 0 255;
-                                       rel1 {
-                                               relative: 0.0 0.0;
-                                       }
-                                       rel2 {
-                                               relative: 1.0 1.0;
-                                       }
-                               }
-                       }
-                       part {
-                               name: "elm.genlist";
-                               type: SWALLOW;
-                               scale: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       rel1 {
-                                               relative: 0.0 0.0;
-                                               to: "bg";
-                                       }
-                                       rel2 {
-                                               relative: 1.0 1.0;
-                                               to: "bg";
-                                       }
-                               }
-                       }
-               }
-       }
-}
\ No newline at end of file

diff --git a/include/setting-accessibility.h b/include/setting-accessibility.h
index b5881e68ff48fa3a399f3fedd903e79197593fe7..f801b1af4c4c87248f43fea6a293f0c02bbcd57a 100644 (file)
--- a/include/setting-accessibility.h
+++ b/include/setting-accessibility.h
@@ -26,8 +26,8 @@
 #include <efl_extension.h>
 
 #define VCONFKEY_SETAPPL_ACCESSIBILITY_TTS "db/setting/accessibility/tts"
-#define SETTING_ACCESSIBILITY_PACKAGE_NAME "accessibility-setting"
-#define EDJE_PATH TZ_SYS_RO_APP_D"/org.tizen.accessibility-setting/res/edje/accessibility-setting.edj"
+#define SETTING_ACCESSIBILITY_PACKAGE_NAME "accessibility-setting-wearable"
+#define EDJE_PATH TZ_SYS_RO_APP_D"/org.tizen.accessibility-setting-wearable/res/edje/accessibility-setting-wearable.edj"
 #define access_gettext(s) dgettext(SETTING_ACCESSIBILITY_PACKAGE_NAME, s)
 
 typedef enum {

diff --git a/org.tizen.accessibility-setting-wearable.manifest b/org.tizen.accessibility-setting-wearable.manifest
new file mode 100644 (file)
index 0000000..97e8c31
--- /dev/null
+++ b/org.tizen.accessibility-setting-wearable.manifest
@@ -0,0 +1,5 @@
+<manifest>
+       <request>
+               <domain name="_"/>
+       </request>
+</manifest>

diff --git a/org.tizen.accessibility-setting-wearable.xml b/org.tizen.accessibility-setting-wearable.xml
new file mode 100644 (file)
index 0000000..4dc97e1
--- /dev/null
+++ b/org.tizen.accessibility-setting-wearable.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest xmlns="http://tizen.org/ns/packages" package="org.tizen.accessibility-setting-wearable" version="0.0.1" install-location="internal-only" api-version="3.0">
+       <label>Accessibility Setting for Wearable</label>
+       <description>Accessibility Setting App for Wearable</description>
+       <ui-application appid="org.tizen.accessibility-setting-wearable" exec="accessibility-setting-wearable" nodisplay="true" multiple="false" type="capp" taskmanage="false" mainapp="true" process-pool="true" hw-acceleration="use-GL">
+               <label>Accessibility Setting for Wearable</label>
+               <label xml:lang="en-us">Accessibility Setting for Wearable</label>
+       </ui-application>
+</manifest>

diff --git a/org.tizen.accessibility-setting.manifest b/org.tizen.accessibility-setting.manifest
deleted file mode 100644 (file)
index 97e8c31..0000000
--- a/org.tizen.accessibility-setting.manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-<manifest>
-       <request>
-               <domain name="_"/>
-       </request>
-</manifest>

diff --git a/org.tizen.accessibility-setting.xml b/org.tizen.accessibility-setting.xml
deleted file mode 100644 (file)
index 5e50b41..0000000
--- a/org.tizen.accessibility-setting.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest xmlns="http://tizen.org/ns/packages" package="org.tizen.accessibility-setting" version="0.0.1" install-location="internal-only" api-version="3.0">
-       <label>Accessibility Setting</label>
-       <description>Accessibility Setting App</description>
-       <ui-application appid="org.tizen.accessibility-setting" exec="accessibility-setting" nodisplay="true" multiple="false" type="capp" taskmanage="false" mainapp="true" process-pool="true" hw-acceleration="use-GL">
-               <label>Accessibility Setting</label>
-               <label xml:lang="en-us">Accessibility Setting</label>
-       </ui-application>
-</manifest>

diff --git a/packaging/org.tizen.accessibility-setting-wearable.spec b/packaging/org.tizen.accessibility-setting-wearable.spec
new file mode 100644 (file)
index 0000000..d215080
--- /dev/null
+++ b/packaging/org.tizen.accessibility-setting-wearable.spec
@@ -0,0 +1,45 @@
+Name:       org.tizen.accessibility-setting-wearable
+Summary:    Accessibility Setting Application
+Version:    0.0.1
+Release:    1
+Group:      UI Framework
+License:    Apache-2.0
+Source0:    %{name}-%{version}.tar.gz
+
+BuildRequires:  gettext-tools
+BuildRequires:  pkgconfig(elementary)
+BuildRequires:  pkgconfig(dlog)
+BuildRequires:  pkgconfig(vconf)
+BuildRequires:  cmake
+BuildRequires:  pkgconfig(libtzplatform-config)
+BuildRequires:  pkgconfig(appcore-efl)
+BuildRequires:  pkgconfig(appcore-common)
+BuildRequires:  pkgconfig(efl-extension)
+BuildRequires:  pkgconfig(capi-appfw-application)
+
+%description
+Accessibility setting application for wearable
+
+%prep
+%setup -q
+%define _pkg_dir %{TZ_SYS_RO_APP}/%{name}
+
+%build
+
+rm -rf CMakeFiles CMakeCache.txt && cmake . -DCMAKE_INSTALL_PREFIX=%{_pkg_dir}} \
+                                            -DTZ_SYS_RO_APP=%TZ_SYS_RO_APP \
+                                            -DTZ_SYS_RO_PACKAGES=%TZ_SYS_RO_PACKAGES \
+
+make %{?jobs:-j%jobs}
+
+%install
+%make_install
+
+
+%files
+%defattr(-,root,root,-)
+%{_pkg_dir}/bin/*
+%{_pkg_dir}/res/*
+%{TZ_SYS_RO_PACKAGES}/%{name}.xml
+%manifest %{name}.manifest
+%license LICENSE

diff --git a/packaging/org.tizen.accessibility-setting.spec b/packaging/org.tizen.accessibility-setting.spec
deleted file mode 100644 (file)
index 249c046..0000000
--- a/packaging/org.tizen.accessibility-setting.spec
+++ /dev/null
@@ -1,45 +0,0 @@
-Name:       org.tizen.accessibility-setting
-Summary:    Accessibility Setting Application
-Version:    0.0.1
-Release:    1
-Group:      UI Framework
-License:    Apache-2.0
-Source0:    %{name}-%{version}.tar.gz
-
-BuildRequires:  gettext-tools
-BuildRequires:  pkgconfig(elementary)
-BuildRequires:  pkgconfig(dlog)
-BuildRequires:  pkgconfig(vconf)
-BuildRequires:  cmake
-BuildRequires:  pkgconfig(libtzplatform-config)
-BuildRequires:  pkgconfig(appcore-efl)
-BuildRequires:  pkgconfig(appcore-common)
-BuildRequires:  pkgconfig(efl-extension)
-BuildRequires:  pkgconfig(capi-appfw-application)
-
-%description
-Accessibility setting application.
-
-%prep
-%setup -q
-%define _pkg_dir %{TZ_SYS_RO_APP}/%{name}
-
-%build
-
-rm -rf CMakeFiles CMakeCache.txt && cmake . -DCMAKE_INSTALL_PREFIX=%{_pkg_dir}} \
-                                            -DTZ_SYS_RO_APP=%TZ_SYS_RO_APP \
-                                            -DTZ_SYS_RO_PACKAGES=%TZ_SYS_RO_PACKAGES \
-
-make %{?jobs:-j%jobs}
-
-%install
-%make_install
-
-
-%files
-%defattr(-,root,root,-)
-%{_pkg_dir}/bin/*
-%{_pkg_dir}/res/*
-%{TZ_SYS_RO_PACKAGES}/%{name}.xml
-%manifest %{name}.manifest
-%license LICENSE