power off popup : modify power off icon for wearable 98/101698/3 accepted/tizen/3.0/common/20161205.091728 accepted/tizen/3.0/mobile/20161204.234948 accepted/tizen/3.0/tv/20161204.235006 accepted/tizen/3.0/wearable/20161204.235023 submit/tizen_3.0/20161202.060522
authorlokilee73 <changjoo.lee@samsung.com>
Fri, 2 Dec 2016 04:21:44 +0000 (13:21 +0900)
committerlokilee73 <changjoo.lee@samsung.com>
Fri, 2 Dec 2016 05:09:53 +0000 (14:09 +0900)
Change-Id: I5eeeec5caebd806d742dc796ddf873926fb6d5ef
Signed-off-by: lokilee73 <changjoo.lee@samsung.com>
data/gear_device_options_bg.png [new file with mode: 0755]
data/gear_device_options_power_off.png [new file with mode: 0755]
packaging/system-servant.spec
src/powerkey/CMakeLists.txt
src/powerkey/powerkey-wearable.c

diff --git a/data/gear_device_options_bg.png b/data/gear_device_options_bg.png
new file mode 100755 (executable)
index 0000000..137db6c
Binary files /dev/null and b/data/gear_device_options_bg.png differ
diff --git a/data/gear_device_options_power_off.png b/data/gear_device_options_power_off.png
new file mode 100755 (executable)
index 0000000..4997109
Binary files /dev/null and b/data/gear_device_options_power_off.png differ
index 1cc5cb9..90fb9b6 100755 (executable)
@@ -359,7 +359,8 @@ rm -rf %{buildroot}
 %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
-%{TZ_SYS_RO_APP}/org.tizen.powerkey-syspopup/res/saving_device_options_power_off.png
+%{TZ_SYS_RO_APP}/org.tizen.powerkey-syspopup/res/gear_device_options_bg.png
+%{TZ_SYS_RO_APP}/org.tizen.powerkey-syspopup/res/gear_device_options_power_off.png
 %endif
 %endif
 
index 7b102ca..8cea45c 100755 (executable)
@@ -74,7 +74,8 @@ INSTALL(FILES ${CMAKE_SOURCE_DIR}/src/powerkey/${PKGNAME}.xml DESTINATION ${MANI
 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})
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/saving_device_options_power_off.png DESTINATION ${RESDIR})
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/gear_device_options_bg.png DESTINATION ${RESDIR})
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/gear_device_options_power_off.png DESTINATION ${RESDIR})
 ENDIF()
 
 IF(PROFILE STREQUAL mobile)
index 7e01976..63e148b 100755 (executable)
@@ -169,22 +169,34 @@ static Evas_Object *_gl_menu_contents_get_airplane(void *data, Evas_Object *obj,
 
 static Evas_Object *_gl_menu_contents_get_poweroff(void *data, Evas_Object *obj, const char *part)
 {
-       Evas_Object *img;
+       Evas_Object *img1, *img2, *table;
        Evas_Coord w, h;
 
        if (!strncmp(part, "elm.icon", sizeof("elm.icon"))) {
                _D("index = POWEROFF_MODE");
-               img = elm_image_add(obj);
-               if (!img) {
+               table = elm_table_add(obj);
+               img1 = elm_image_add(table);
+               img2 = elm_image_add(table);
+               if (!img1 || !img2) {
                        _E("BAD image!");
                        return NULL;
                }
-               elm_image_file_set(img, RESDIR"/saving_device_options_power_off.png", NULL);
-               elm_image_object_size_get(img, &w, &h);
-               evas_object_size_hint_min_set(img, w, h);
-               return img;
-       } else
+               elm_image_file_set(img1, RESDIR"/gear_device_options_bg.png", NULL);
+               evas_object_color_set(img1, 192, 192, 192, 80);
+               elm_image_file_set(img2, RESDIR"/gear_device_options_power_off.png", NULL);
+               elm_table_pack(table, img1, 0, 0, 1, 1);
+               elm_table_pack(table, img2, 0, 0, 1, 1);
+               elm_image_object_size_get(img1, &w, &h);
+               evas_object_size_hint_min_set(img1, w, h);
+               evas_object_size_hint_min_set(img1, ELM_SCALE_SIZE(w), ELM_SCALE_SIZE(h));
+               evas_object_size_hint_align_set(img2, EVAS_HINT_FILL, EVAS_HINT_FILL);
+               evas_object_size_hint_weight_set(img2, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+               evas_object_show(img1);
+               evas_object_show(img2);
+               return table;
+       } else {
                return NULL;
+       }
 }
 
 static void pm_state_changed(keynode_t *key, void *data)