Merge tizen 2.4 into tizensubmit/tizen/20160415.153127accepted/tizen/wearable/20160418.012429accepted/tizen/tv/20160418.012427accepted/tizen/mobile/20160418.012514accepted/tizen/ivi/20160418.012438accepted/tizen/common/20160418.141352

- Fix the syspopup db
- Add a syspopup db for the wearable profile

Change-Id: Ib4a4d75a3add27a0d78a1ec92b9ef703b8e3f1d8
Signed-off-by: Hwankyu Jhun <h.jhun@samsung.com>

4 files changed, 59 insertions, 13 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1ce597b..2d64502 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -65,7 +65,11 @@ add_library(syspopup_mods STATIC
 		)
 
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/SLP_SYSPOPUP_PG.h DESTINATION include)
+IF(PROFILE_WEARABLE)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/wearable/syspopup_db.sql DESTINATION ${TZ_SYS_RO_SHARE}/syspopup)
+ELSE(PROFILE_WEARABLE)
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/syspopup_db.sql DESTINATION ${TZ_SYS_RO_SHARE}/syspopup)
+ENDIF(PROFILE_WEARABLE)
 
 add_subdirectory(syspopup)
 add_subdirectory(syspopup-caller)
diff --git a/data/syspopup_db.sql b/data/syspopup_db.sql
index 4e631c9..26c36ee 100755
--- a/data/syspopup_db.sql
+++ b/data/syspopup_db.sql
@@ -21,14 +21,18 @@ INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"volume",			1,1,-1,1,1,"org.t
 INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"bt-syspopup",		0,0,-1,0,0,"org.tizen.bt-syspopup");
 INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"wifi-qs",			0,0,-1,0,2,"net.wifi-qs");
 INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"poweroff-syspopup",		2,0,-1,0,0,"org.tizen.poweroff-syspopup");
-INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"lowmem-syspopup",		1,0,5,0,0,"org.tizen.lowmem-syspopup");
+INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"lowmem-syspopup",		0,0,5,0,0,"org.tizen.lowmem-syspopup");
 INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"lowbat-syspopup",		1,0,5,0,0,"org.tizen.lowbat-syspopup");
-INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"net-popup",			0,0,-1,0,0,"org.tizen.net-popup");
+INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"net-popup",			0,0,-1,0,0,"net.netpopup");
 INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"usb-syspopup",		1,0,-1,2,2,"org.tizen.usb-syspopup");
-INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"ims-syspopup",		1,1,-1,2,2,"org.tizen.ims-syspopup");
-INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"mdm-syspopup",		1,1,5,0,0,"org.tizen.mdm-syspopup");
-INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"tickernoti-syspopup",	1,1,-1,2,2,"org.tizen.tickernoti-syspopup");
-INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"usbotg-syspopup",		0,0,-1,0,0,"org.tizen.usbotg-syspopup");
-INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"allshare-popup",            0,0,-1,0,0,"org.tizen.allshare-popup");
+INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"usbotg-syspopup",		0,1,-1,0,0,"org.tizen.usbotg-syspopup");
 INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"mmc-syspopup",		0,0,-1,0,0,"org.tizen.mmc-syspopup");
+INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"mobileap-syspopup",		0,0,-1,0,0,"org.tizen.mobileap-syspopup");
+INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"telephony-syspopup",	1,1,5,0,0,"org.tizen.telephony-syspopup");
+INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"system-syspopup",		2,0,-1,0,0,"org.tizen.system-syspopup");
+INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"safetyvolume-syspopup",	1,0,-1,0,0,"org.tizen.safetyvolume-syspopup");
 INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"datausage-syspopup",	1,0,-1,0,0,"org.tizen.datausage-syspopup");
+INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"crash-popup",		1,0,-1,0,0,"org.tizen.crash-popup");
+INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"gps-syspopup",		0,0,-1,0,0,"org.tizen.gps-syspopup");
+INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"mode-syspopup",		1,0,-1,0,0,"org.tizen.mode-syspopup");
+
diff --git a/data/wearable/syspopup_db.sql b/data/wearable/syspopup_db.sql
new file mode 100755
index 0000000..1a88d96
--- /dev/null
+++ b/data/wearable/syspopup_db.sql
@@ -0,0 +1,26 @@
+PRAGMA journal_mode = PERSIST;
+
+/* prio : 0~2 (0:low, 2:high) */
+/* focus : 0~1 (0:focus, 1:unfocus) */
+/* timeout : -1 ~ integer value (-1:infinite, 0:don't use) */
+/* term_act : 0~2(0:TERM, 1:HIDE, 2:IGNORE) */
+/* endkey_act : 0~2(0:TERM, 1:HIDE, 2:IGNORE) */
+CREATE TABLE IF NOT EXISTS syspopup_info (
+	id INTEGER PRIMARY KEY,
+	name TEXT UNIQUE NOT NULL,
+	prio INTEGER,
+	focus INTEGER,
+	timeout INTEGER,
+	term_act INTEGER,
+	endkey_act INTEGER,
+	pkgname TEXT
+);
+
+INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"volume",                    1,1,-1,1,1,"org.tizen.windicator");
+INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"poweroff-syspopup",         2,0,-1,0,0,"org.tizen.poweroff-syspopup");
+INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"lowmem-syspopup",           0,0,5,0,0,"org.tizen.lowmem-syspopup");
+INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"lowbat-syspopup",           1,0,5,0,0,"org.tizen.lowbat-syspopup");
+INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"system-syspopup",           2,0,-1,0,0,"org.tizen.system-syspopup");
+INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"safetyvolume-syspopup",     2,1,-1,0,0,"org.tizen.safetyvolume-syspopup");
+INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"crash-popup",               1,0,-1,0,0,"org.tizen.crash-popup");
+INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"wc-syspopup",               0,0,-1,0,0,"net.wc-syspopup");
diff --git a/packaging/syspopup.spec b/packaging/syspopup.spec
index ba4b94c..7322ae7 100644
--- a/packaging/syspopup.spec
+++ b/packaging/syspopup.spec
@@ -36,6 +36,12 @@ BuildRequires:  pkgconfig(libtzplatform-config)
 BuildRequires:  pkgconfig(capi-appfw-application)
 BuildRequires:  pkgconfig(capi-system-system-settings)
 
+%if "%{?profile}" == "wearable"
+%define profile_wearable 1
+%else
+%define profile_wearable 0
+%endif
+
 %description
 syspopup package for popup
 
@@ -71,17 +77,23 @@ sed -i %{SOURCE1001} -e "s|TZ_SYS_DB|%TZ_SYS_DB|g"
 cp %{SOURCE1001} %{SOURCE1002} %{SOURCE1003} %{SOURCE1004} .
 
 %build
-%cmake . \
+%if %{?profile_wearable}
+PROFILE_WEARABLE=ON
+%endif
+
+%cmake \
 %if %{with wayland}
--Dwith_wayland=TRUE \
+	-Dwith_wayland=TRUE \
 %else
 %if %{with x}
--Dwith_x11=TRUE \
+	-Dwith_x11=TRUE \
 %endif
 %endif
--DTZ_SYS_RO_PACKAGES=%{TZ_SYS_RO_PACKAGES} \
--DTZ_SYS_RO_SHARE=%{TZ_SYS_RO_SHARE} \
--DEXTRA_CFLAGS=-fPIC
+	-DTZ_SYS_RO_PACKAGES=%{TZ_SYS_RO_PACKAGES} \
+	-DTZ_SYS_RO_SHARE=%{TZ_SYS_RO_SHARE} \
+	-DEXTRA_CFLAGS=-fPIC \
+	-DPROFILE_WEARABLE:BOOL=${PROFILE_WEARABLE} \
+	.
 
 make %{?jobs:-j%jobs}