Move circle button image and mobile powerkey image to data folder 65/77565/1 accepted/tizen/common/20160701.192916 accepted/tizen/mobile/20160701.034436 accepted/tizen/tv/20160701.034324 accepted/tizen/wearable/20160701.034416 submit/tizen/20160701.013517 submit/tizen_common/20160701.180000
authorchangjoo.lee <changjoo.lee@samsung.com>
Thu, 30 Jun 2016 07:55:38 +0000 (16:55 +0900)
committerchangjoo.lee <changjoo.lee@samsung.com>
Thu, 30 Jun 2016 07:55:57 +0000 (16:55 +0900)
Change-Id: Ib5c7da272f59b964f767c28c7b2cf83cb97c2da6
Signed-off-by: changjoo.lee <changjoo.lee@samsung.com>
circle_btn_check.png [deleted file]
circle_btn_delete.png [deleted file]
core_power_off.png [deleted file]
core_restart.png [deleted file]
data/circle_btn_check.png [new file with mode: 0755]
data/circle_btn_delete.png [new file with mode: 0755]
data/core_power_off.png [new file with mode: 0755]
data/core_restart.png [new file with mode: 0755]
packaging/system-servant.spec
src/powerkey/CMakeLists.txt

diff --git a/circle_btn_check.png b/circle_btn_check.png
deleted file mode 100644 (file)
index f20f62e..0000000
Binary files a/circle_btn_check.png and /dev/null differ
diff --git a/circle_btn_delete.png b/circle_btn_delete.png
deleted file mode 100644 (file)
index 5f346cb..0000000
Binary files a/circle_btn_delete.png and /dev/null differ
diff --git a/core_power_off.png b/core_power_off.png
deleted file mode 100755 (executable)
index 379a09e..0000000
Binary files a/core_power_off.png and /dev/null differ
diff --git a/core_restart.png b/core_restart.png
deleted file mode 100755 (executable)
index fcf95c6..0000000
Binary files a/core_restart.png and /dev/null differ
diff --git a/data/circle_btn_check.png b/data/circle_btn_check.png
new file mode 100755 (executable)
index 0000000..f20f62e
Binary files /dev/null and b/data/circle_btn_check.png differ
diff --git a/data/circle_btn_delete.png b/data/circle_btn_delete.png
new file mode 100755 (executable)
index 0000000..5f346cb
Binary files /dev/null and b/data/circle_btn_delete.png differ
diff --git a/data/core_power_off.png b/data/core_power_off.png
new file mode 100755 (executable)
index 0000000..379a09e
Binary files /dev/null and b/data/core_power_off.png differ
diff --git a/data/core_restart.png b/data/core_restart.png
new file mode 100755 (executable)
index 0000000..fcf95c6
Binary files /dev/null and b/data/core_restart.png differ
index 4b6c8cbb2887cba74262c622b175d6f888fc29d8..110c43b5942d8ad9ada756c51ca98cc608153c14 100755 (executable)
@@ -344,11 +344,15 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{TZ_SYS_RO_APP}/org.tizen.powerkey-syspopup/bin/powerkey-popup
 %{TZ_SYS_RO_SHARE}/packages/org.tizen.powerkey-syspopup.xml
+%if "%{?profile}" == "mobile"
 %{TZ_SYS_RO_APP}/org.tizen.powerkey-syspopup/res/core_power_off.png
 %{TZ_SYS_RO_APP}/org.tizen.powerkey-syspopup/res/core_restart.png
+%endif
+%if "%{?profile}" == "wearable"
 %{TZ_SYS_RO_APP}/org.tizen.powerkey-syspopup/res/circle_btn_check.png
 %{TZ_SYS_RO_APP}/org.tizen.powerkey-syspopup/res/circle_btn_delete.png
 %endif
+%endif
 
 %if %{overheat_popup} == on
 %files -n org.tizen.overheat-syspopup
index a1c7eb52102d6972b4b5c8468e3a09abe30aadf6..6bba0d29de3efe82307de4c1ec28bd687fb53243 100755 (executable)
@@ -70,7 +70,12 @@ TARGET_LINK_LIBRARIES(${EXECNAME} ${powerkey_pkgs_LDFLAGS})
 INSTALL(TARGETS ${EXECNAME} DESTINATION ${TZ_SYS_RO_APP}/${PKGNAME}/bin)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/src/powerkey/${PKGNAME}.xml DESTINATION ${MANIFESTDIR})
 
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/circle_btn_check.png DESTINATION ${RESDIR})
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/circle_btn_delete.png DESTINATION ${RESDIR})
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/core_power_off.png DESTINATION ${RESDIR})
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/core_restart.png DESTINATION ${RESDIR})
+IF(PROFILE STREQUAL wearable)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/circle_btn_check.png DESTINATION ${RESDIR})
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/circle_btn_delete.png DESTINATION ${RESDIR})
+ENDIF()
+
+IF(PROFILE STREQUAL mobile)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/core_power_off.png DESTINATION ${RESDIR})
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/core_restart.png DESTINATION ${RESDIR})
+ENDIF()
\ No newline at end of file