[TNEXT-4548] Change the flightmode disabling screen as per profile

 - Without this change, flightmode disabling screen is shown improper on wearable target.
   so, tt has been changed on the resouce file and the popup style as per the target profile.

Change-Id: Ia3d53e1649554a46d74610e93b0166eba6d4b886

diff --git a/callmgr-popup/res/edc/popup_custom.edc b/callmgr-popup/res/edc/popup_custom.edc
index dae81fa4a36acc74458b7b3d4d4835c98e42a419..4445fc6b8caea6e2edd22694a35246a19a200220 100644 (file)
--- a/callmgr-popup/res/edc/popup_custom.edc
+++ b/callmgr-popup/res/edc/popup_custom.edc
@@ -192,5 +192,100 @@ collections {
                                }
                        }
                }
+       group { name: "popup_processingview_wearable";
+#define DEMO_POPUP_PROCESSINGVIEW1BUTTON_CONTENT_MIN 0 120
+                       styles {
+                               style { name: "popup_processing_text_style_wearable";
+                                       base: "font=Tizen:style=Regular align=left font_size="50" color=#FFFFFF wrap=mixed ellipsis=1.0 text_class=tizen";
+                                       tag: "br" "\n";
+                                       tag: "tab" "\t";
+                                       }
+                               }
 
+                       parts {
+                               part { name: "base";
+                                       type: SPACER;
+                                       scale: 1;
+                                       description { state: "default" 0.0;
+                                               min: DEMO_POPUP_PROCESSINGVIEW1BUTTON_CONTENT_MIN;
+                                               fixed: 1 0;
+                                       }
+                               }
+                               part { name: "pad_l";
+                                       type: SPACER;
+                                       scale: 1;
+                                       description { state: "default" 0.0;
+                                               min: 32 0;
+                                               fixed: 1 0;
+                                                       rel1.relative: 0.0 0.0;
+                                                       rel2.relative: 0.0 1.0;
+                                               align: 0.0 0.0;
+                                       }
+                               }
+                               part { name: "pad_r";
+                                       type: SPACER;
+                                       scale: 1;
+                                       description { state: "default" 0.0;
+                                               min: 32 0;
+                                               fixed: 1 0;
+                                                       rel1.relative: 1.0 0.0;
+                                                       rel2.relative: 1.0 1.0;
+                                               align: 1.0 0.0;
+                                       }
+                               }
+                               part { name: "elm.swallow.content";
+                                       type: SWALLOW;
+                                       scale: 1;
+                                       description { state: "default" 0.0;
+                                               fixed: 1 1;
+                                               min: 0 56;
+                                               max: 0 56;
+                                               rel1 {
+                                                       relative: 1.0 0.0;
+                                                       to_x: "pad_l";
+                                               }
+                                               rel2 {
+                                                       relative: 0.0 1.0;
+                                                       to_x: "pad_r";
+                                               }
+                                               align: 0.0 0.5;
+                                       }
+                               }
+                               part { name: "pad_after_processing";
+                                       type: SPACER;
+                                       scale: 1;
+                                       description { state: "default" 0.0;
+                                               fixed: 1 1;
+                                               min: 32 120;
+                                               rel1 {
+                                                       relative: 1.0 0.0;
+                                                       to: "elm.swallow.content";
+                                               }
+                                               rel2.to: "elm.swallow.content";
+                                               align: 0.0 0.5;
+                                       }
+                               }
+                               part { name: "elm.text";
+                                       type: TEXTBLOCK;
+                                       scale : 1;
+                                       description { state: "default" 0.0;
+                                               min: 1 1;
+                                               fixed: 0 1;
+                                               rel1 {
+                                                       relative: 1.0 0.0;
+                                                       to: "pad_after_processing";
+                                               }
+                                               rel2 {
+                                                       relative: 0.0 1.0;
+                                                       to_x: "pad_r";
+                                               }
+                                               align: 0.0 0.5;
+                                               text {
+                                                       style: "popup_processing_text_style_wearable";
+                                                       min: 0 1;
+                                               }
+                                       }
+                               }
+                       }
+               }
 }

diff --git a/callmgr-popup/src/callmgr-popup-widget.c b/callmgr-popup/src/callmgr-popup-widget.c
index 71647c517819635d91a9d7dcb77f0d535d168407..bc743dc76c5038e0ffc206a22cc588a4bacd5cc1 100644 (file)
--- a/callmgr-popup/src/callmgr-popup-widget.c
+++ b/callmgr-popup/src/callmgr-popup-widget.c
@@ -411,6 +411,8 @@ Evas_Object *_callmgr_popup_create_progressbar(Evas_Object *parent, const char *
 void _callmgr_popup_create_popup_checking(void *data, char *string)
 {
        CallMgrPopAppData_t *ad = (CallMgrPopAppData_t *)data;
+       char *profile = NULL;
+
        ret_if(NULL == ad);
 
        char popup_msg[DEF_BUF_LEN_LONG] = { 0, };
@@ -429,20 +431,57 @@ void _callmgr_popup_create_popup_checking(void *data, char *string)
        snprintf(popup_msg, DEF_BUF_LEN_LONG, "%s", string);
        DBG("msg:[%s]", popup_msg);
 
-       ad->popup = elm_popup_add(ad->win_main);
-       elm_popup_align_set(ad->popup, ELM_NOTIFY_ALIGN_FILL, 1.0);
-       evas_object_size_hint_weight_set(ad->popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-       popup_ly = elm_layout_add(ad->popup);
-       elm_layout_file_set(popup_ly, PATH_EDJ, "popup_processingview");
-       elm_object_part_text_set(popup_ly, "elm.text", popup_msg);
-       evas_object_size_hint_weight_set(popup_ly, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+       system_info_get_platform_string("tizen.org/feature/profile", &profile);
+       if (!profile) {
+               ERR("profile is NULL");
+               return;
+       }
+       DBG("profile: %s", profile);
 
-       progressbar = _callmgr_popup_create_progressbar(ad->popup, "process_medium");
+       if (!g_strcmp0(profile, "mobile")) {
+               ad->popup = elm_popup_add(ad->win_main);
+               elm_popup_align_set(ad->popup, ELM_NOTIFY_ALIGN_FILL, 1.0);
+               evas_object_size_hint_weight_set(ad->popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+               popup_ly = elm_layout_add(ad->popup);
+               elm_layout_file_set(popup_ly, PATH_EDJ, "popup_processingview");
+               elm_object_part_text_set(popup_ly, "elm.text", popup_msg);
+               evas_object_size_hint_weight_set(popup_ly, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+
+               progressbar = elm_progressbar_add(ad->popup);
+               elm_progressbar_pulse(progressbar, EINA_TRUE);
+               elm_object_style_set(progressbar, "process_medium");
+               elm_progressbar_horizontal_set(progressbar, EINA_TRUE);
+               evas_object_size_hint_align_set(progressbar, EVAS_HINT_FILL, EVAS_HINT_FILL);
+               evas_object_size_hint_weight_set(progressbar, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+               evas_object_show(progressbar);
+
+               elm_object_part_content_set(popup_ly, "elm.swallow.content", progressbar);
+               elm_object_content_set(ad->popup, popup_ly);
 
-       elm_object_part_content_set(popup_ly, "elm.swallow.content", progressbar);
-       elm_object_content_set(ad->popup, popup_ly);
+               evas_object_show(ad->popup);
+       } else if (!g_strcmp0(profile, "wearable")) {
+               ad->popup = elm_popup_add(ad->win_main);
+               elm_object_style_set(ad->popup, "circle");
+               elm_popup_align_set(ad->popup, ELM_NOTIFY_ALIGN_FILL, 1.0);
+               evas_object_size_hint_weight_set(ad->popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+               popup_ly = elm_layout_add(ad->popup);
+               elm_layout_file_set(popup_ly, PATH_EDJ, "popup_processingview_wearable");
+               elm_object_part_text_set(popup_ly, "elm.text", popup_msg);
+               evas_object_size_hint_weight_set(popup_ly, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+
+               progressbar = elm_progressbar_add(ad->popup);
+               elm_progressbar_pulse(progressbar, EINA_TRUE);
+               elm_object_style_set(progressbar, "process/popup/small");
+               elm_progressbar_horizontal_set(progressbar, EINA_TRUE);
+               evas_object_size_hint_align_set(progressbar, EVAS_HINT_FILL, 0.5);
+               evas_object_size_hint_weight_set(progressbar, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+               evas_object_show(progressbar);
+
+               elm_object_part_content_set(popup_ly, "elm.swallow.content", progressbar);
+               elm_object_content_set(ad->popup, popup_ly);
 
-       evas_object_show(ad->popup);
+               evas_object_show(ad->popup);
+       }
 }
 
 void _callmgr_popup_create_toast_msg(void *data, char *string)

diff --git a/packaging/call-manager.spec b/packaging/call-manager.spec
index 19b02214c65c03d00597389c5e5ebb29f8a6431f..37545e2ba8506ea89db9bd60f136a47b6cac7e1b 100644 (file)
--- a/packaging/call-manager.spec
+++ b/packaging/call-manager.spec
@@ -1,6 +1,6 @@
 %define major 0
 %define minor 2
-%define patchlevel 39
+%define patchlevel 40
 %define ext_feature 0
 
 Name:           call-manager