From: Kiseok Chang Date: Fri, 8 Feb 2019 01:37:24 +0000 (+0000) Subject: Revert "remove globally-shared resource from package" X-Git-Tag: submit/tizen/20190208.020253^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a0b3ee9310c5a467a017b9403c3b48b20532ffcd;p=profile%2Fmobile%2Fapps%2Fnative%2Fsettings.git Revert "remove globally-shared resource from package" This reverts commit 7f51e0b66526661c0fd800e79580bf91c33cc37a. Change-Id: Ib8ae99520a6d6eae8fdcbae578e6f227f9227587 --- diff --git a/packaging/org.tizen.setting.spec b/packaging/org.tizen.setting.spec index 638e2fcc..72c26e31 100755 --- a/packaging/org.tizen.setting.spec +++ b/packaging/org.tizen.setting.spec @@ -219,3 +219,6 @@ mkdir -p %{_prefix}/apps/org.tizen.mode-syspopup/bin/ %{PREFIX}/res/edje/* %{PREFIX}/res/icons/* %{PREFIX}/res/images/* + +%{TZ_SYS_GLOBALUSER_DATA}/settings/* + diff --git a/resource/media/settings/Alerts/General notification_sdk.wav b/resource/media/settings/Alerts/General notification_sdk.wav new file mode 100644 index 00000000..64873892 Binary files /dev/null and b/resource/media/settings/Alerts/General notification_sdk.wav differ diff --git a/resource/media/settings/Ringtones/ringtone_sdk.mp3 b/resource/media/settings/Ringtones/ringtone_sdk.mp3 new file mode 100644 index 00000000..f159e35e Binary files /dev/null and b/resource/media/settings/Ringtones/ringtone_sdk.mp3 differ diff --git a/resource/media/settings/Wallpapers/home_001.png b/resource/media/settings/Wallpapers/home_001.png new file mode 100644 index 00000000..ba5cd1ef Binary files /dev/null and b/resource/media/settings/Wallpapers/home_001.png differ diff --git a/resource/media/settings/Wallpapers/home_002.png b/resource/media/settings/Wallpapers/home_002.png new file mode 100644 index 00000000..76780cd3 Binary files /dev/null and b/resource/media/settings/Wallpapers/home_002.png differ diff --git a/resource/media/settings/Wallpapers/home_003.png b/resource/media/settings/Wallpapers/home_003.png new file mode 100644 index 00000000..bc6bd1a7 Binary files /dev/null and b/resource/media/settings/Wallpapers/home_003.png differ diff --git a/resource/media/settings/Wallpapers/home_004.png b/resource/media/settings/Wallpapers/home_004.png new file mode 100644 index 00000000..5beb79e4 Binary files /dev/null and b/resource/media/settings/Wallpapers/home_004.png differ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 328954b0..2b8ac7ce 100755 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -130,6 +130,8 @@ INSTALL(FILES ${CMAKE_SOURCE_DIR}/${SETTING_PKG_NAME}.png DESTINATION ${TZ_SYS_R INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/resource/icons DESTINATION ${TZ_SYS_RO_APP}/${SETTING_PKG_NAME}/res FILES_MATCHING PATTERN "*.png") INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/resource/images DESTINATION ${TZ_SYS_RO_APP}/${SETTING_PKG_NAME}/res FILES_MATCHING PATTERN "*.png") +# install media-data ; should be at /usr/share +INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/resource/media/settings DESTINATION ${TZ_SYS_GLOBALUSER_DATA} PATTERN "*") #IF("${BUILD_ARCH}" STREQUAL "arm") # INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/resource/media-data-sdk/settings DESTINATION ${TZ_SYS_RO_APP}/org.tizen.setting/shared/res PATTERN "*") #ELSE("${BUILD_ARCH}" STREQUAL "arm")