Use API for widget instance id to launcher proper setup-app

Change-Id: I7ded23d96d309eefd8c57142dfe2ab9aad4c53eb

diff --git a/res/edje/circle/moments_layout.edc b/res/edje/circle/moments_layout.edc
index 1fcd50c11e59f1a48888a3d286ca14e654eca671..a0102f975283176a92e05ad9ca99b7720b687b2c 100755 (executable)
--- a/res/edje/circle/moments_layout.edc
+++ b/res/edje/circle/moments_layout.edc
@@ -17,7 +17,7 @@
 #include "../../../inc/moments/moments_view_edje_conf.h"
 
 images {
-   image: "masking_bg.png" COMP;
+   image: "b_moment_bar_detail_bg_cover.png" COMP;
 }
 
 collections {
@@ -42,7 +42,7 @@ collections {
                state: "default" 0.0;
                rel1 { relative: 0.0 0.0; to: SIZE_SETTER; }
                rel2 { relative: 1.0 1.0; to: SIZE_SETTER; }
-               image { normal: "masking_bg.png"; }
+               image { normal: "b_moment_bar_detail_bg_cover.png"; }
                color: 0 0 0 255;
             }
          }

diff --git a/res/edje/circle/moments_status_layout.edc b/res/edje/circle/moments_status_layout.edc
index b002f16f2c0a1ccbf9b02792845e50a10cb6d987..83ab14ed48178d0b982d4c66dd22926586caeaae 100755 (executable)
--- a/res/edje/circle/moments_status_layout.edc
+++ b/res/edje/circle/moments_status_layout.edc
@@ -30,7 +30,7 @@ styles {
 collections {
    group { STATUS_LAYOUT;
       images {
-         image: "moment_bar_masking_1.png" COMP;
+         image: "moment_bar_masking_2.png" COMP;
          }
       parts {
          part {
@@ -55,8 +55,8 @@ collections {
                align: 0 0;
                rel1 { relative: 0.0 0.0; to: SIZE_SETTER; }
                rel2 { relative: 1.0 1.0; to: SIZE_SETTER; }
-               image.normal: "moment_bar_masking_1.png";
-                          color: 0 0 0 255;
+               image.normal: "moment_bar_masking_2.png";
+                          color: 0 0 0 100;
             }
          }
          part {

diff --git a/res/edje/images/b_moment_bar_detail_bg_cover.png b/res/edje/images/b_moment_bar_detail_bg_cover.png
old mode 100755 (executable)
new mode 100644 (file)
index bd78710..e73bfb0
Binary files a/res/edje/images/b_moment_bar_detail_bg_cover.png and b/res/edje/images/b_moment_bar_detail_bg_cover.png differ

diff --git a/res/edje/images/moment_bar_masking_2.png b/res/edje/images/moment_bar_masking_2.png
new file mode 100644 (file)
index 0000000..fbdc2d9
Binary files /dev/null and b/res/edje/images/moment_bar_masking_2.png differ

diff --git a/src/edit.c b/src/edit.c
index 3b42f79aec4d1d6452c044b250d9e910de024501..4d152b233b6e33ceb302672f7ff6d4d55f1ebfc5 100755 (executable)
--- a/src/edit.c
+++ b/src/edit.c
@@ -86,6 +86,9 @@
 #define MOVE_THRESHOLD 5
 #define SLIPPED_LENGTH 60
 
+#define APP_CONTROL_DATA_WIDGET_INSTANCE_ID "instance_id"
+#define APP_CONTROL_DATA_WIDGET_CONTENT "content_info"
+
 static void _destroy_proxy_bg(Evas_Object *clip_bg);
 static Evas_Object *_create_proxy_bg(Evas_Object *item);
 static Eina_Bool _widget_access_activate_cb(void *data, Evas_Object *obj, Elm_Access_Action_Info *action_info);
@@ -732,6 +735,7 @@ static void _edit_button_click_cb(void *data, Evas_Object *obj, void *event_info
        page_info_s *page_info = NULL;
        const char *widget_id = NULL;
        const char *content_info = NULL;
+       const char *instance_id = NULL;
 
        if(!layout)     {
                _E("layout is null " );
@@ -769,12 +773,14 @@ static void _edit_button_click_cb(void *data, Evas_Object *obj, void *event_info
        ret_if(APP_CONTROL_ERROR_NONE != app_control_create(&service));
        ret_if(NULL == service);
 
+       instance_id = widget_viewer_evas_get_widget_instance_id(page_info->item);
        app_control_set_operation(service, APP_CONTROL_OPERATION_MAIN);
-       app_control_add_extra_data(service, "instance_id", widget_id);
+       app_control_add_extra_data(service, APP_CONTROL_DATA_WIDGET_INSTANCE_ID, instance_id);
        if (content_info) {
-               app_control_add_extra_data(service, "content_info", content_info);
+               app_control_add_extra_data(service, APP_CONTROL_DATA_WIDGET_CONTENT, content_info);
        }
-       app_control_set_app_id(service, SHORTCUT_APP_ID);
+       char *setup_appid = widget_service_get_app_id_of_setup_app(page_info->id);
+       app_control_set_app_id(service, setup_appid);
 
        int ret = app_control_send_launch_request(service, NULL, NULL);
        if (APP_CONTROL_ERROR_NONE != ret) {
@@ -783,8 +789,8 @@ static void _edit_button_click_cb(void *data, Evas_Object *obj, void *event_info
                return;
        }
 
+       free(setup_appid);
        app_control_destroy(service);
-       //util_launch_app(SHORTCUT_APP_ID, NULL, NULL);
 }
 
 
@@ -891,18 +897,18 @@ HAPI void edit_change_focus(Evas_Object *edit_scroller, Evas_Object *page_curren
        {
                if(page_info->id)
                {
-                       if (strcmp(page_info->id, SHORTCUT_WIDGET_ID) == 0)     {
-                               _D( " Showing edit button for page %s", page_info->id);
+                       char *setup_appid = NULL;
+
+                       setup_appid = widget_service_get_app_id_of_setup_app(page_info->id);
+                       if (setup_appid) {
+                               _D( " Showing edit button for page %s", setup_appid);
                                elm_object_signal_emit(layout_info->edit, "edit,show", "edit");
-                       }
-                       else {
-                               _D( " Hiding edit button for page %s", page_info->id);
+                       } else {
+                               _D( " Hiding edit button for page %s", setup_appid);
                                elm_object_signal_emit(layout_info->edit, "edit,hide", "edit");
                        }
-
-               }
-               else
-               {
+                       free(setup_appid);
+               } else {
                        _D( " Hiding edit button for page %s", page_info->id);
                        elm_object_signal_emit(layout_info->edit, "edit,hide", "edit");
                }

diff --git a/src/moments/moments_control_view.c b/src/moments/moments_control_view.c
index f29ae7eeb525757fdade6656fab11858a14a4f91..d033c69f5aeb69acfc7044560b11c4047f36488e 100755 (executable)
--- a/src/moments/moments_control_view.c
+++ b/src/moments/moments_control_view.c
@@ -505,7 +505,7 @@ static void __flight_mode_popup_ok_cb(void *data, Evas_Object *obj, void *event_
 
        int ret = vconf_set_bool(VCONFKEY_TELEPHONY_FLIGHT_MODE, true);
        if (ret < 0) {
-               __T("Failed to set vconfkey(%s) : %d", VCONFKEY_TELEPHONY_FLIGHT_MODE, ret);
+               _E("Failed to set vconfkey(%s) : %d", VCONFKEY_TELEPHONY_FLIGHT_MODE, ret);
        }
 
        elm_popup_dismiss(s_info.flight_mode_popup);