Sync code with tizen 2.4 36/52036/2
authorgs86.lee <gs86.lee@samsung.com>
Wed, 18 Nov 2015 10:55:22 +0000 (19:55 +0900)
committerGeunSun Lee <gs86.lee@samsung.com>
Mon, 7 Dec 2015 00:40:13 +0000 (16:40 -0800)
Change-Id: I0d757d6a5f580dd1b624eb135167c90c1577d231

29 files changed:
data/CMakeLists.txt
data/edje/camera.edc
data/edje/color_classes.edc
data/edje/contextual_event.edc
data/edje/images/enter_pin_dot.png [new file with mode: 0644]
data/edje/images/lock_circle_line_camera.png [new file with mode: 0644]
data/edje/images/lock_circle_line_camera_drag.png [new file with mode: 0644]
data/edje/images/ls_back_02_nor.png [new file with mode: 0644]
data/edje/images/ls_back_02_press.png [new file with mode: 0644]
data/edje/images/ls_icon_call.png [new file with mode: 0644]
data/edje/images/ls_password_underline.#.png [new file with mode: 0644]
data/edje/images/ls_pin_dot.png [new file with mode: 0644]
data/edje/images/miss_noti_bg.#.png [new file with mode: 0644]
data/edje/images/quick_button_icon_bg.png [new file with mode: 0755]
data/edje/images/quick_shot_bg.png [new file with mode: 0644]
data/edje/images/quick_shot_icon.png [new file with mode: 0644]
data/edje/lockscreen.edc
data/edje/missed_event_item.edc
data/edje/swipe_lock.edc
data/images/ls_noti_ic_call.png [new file with mode: 0644]
data/images/ls_noti_ic_msg.png [new file with mode: 0644]
include/camera.h [new file with mode: 0644]
include/contextual_event.h [new file with mode: 0644]
include/lockscreen.h
include/missed_event.h [new file with mode: 0644]
include/music_player.h [new file with mode: 0644]
include/page_indicator.h [new file with mode: 0644]
include/window.h
org.tizen.lockscreen.xml

index 943c55a..26fdf5e 100755 (executable)
@@ -1,11 +1,3 @@
-ADD_CUSTOM_TARGET(index.edj
-                COMMAND edje_cc -id ${CMAKE_CURRENT_SOURCE_DIR}/edje/images
-                ${CMAKE_SOURCE_DIR}/data/edje/index.edc ${CMAKE_BINARY_DIR}/data/edje/index.edj
-                DEPENDS ${CMAKE_SOURCE_DIR}/data/edje/index.edc
-)
-ADD_DEPENDENCIES(${PROJECT_NAME} index.edj)
-INSTALL(FILES edje/index.edj DESTINATION res/edje)
-
 ADD_CUSTOM_TARGET(lockscreen.edj
                 COMMAND edje_cc -id ${CMAKE_CURRENT_SOURCE_DIR}/edje/images
                 ${CMAKE_SOURCE_DIR}/data/edje/lockscreen.edc ${CMAKE_BINARY_DIR}/data/edje/lockscreen.edj
index 545b927..2266cd9 100644 (file)
 group {
        name: "camera-layout";
        images {
-               image: "quick_shot.png" COMP;
-               image: "quick_shot_press.png" COMP;
+               image: "lock_circle_line_camera_drag.png" COMP;
+               image: "lock_circle_line_camera.png" COMP;
+               image: "quick_shot_bg.png" COMP;
+               image: "quick_shot_icon.png" COMP;
        }
        parts {
                part {
                        name: "bg";
                        type: SPACER;
+                       scale: 1;
                        description {
                                state: "default" 0.0;
+                               fixed: 1 1;
+                               min: CAMERA_LAYOUT_SIZE CAMERA_LAYOUT_SIZE;
+                               max: CAMERA_LAYOUT_SIZE CAMERA_LAYOUT_SIZE;
                                rel1 { relative: 0.0 0.0; }
                                rel2 { relative: 1.0 1.0; }
                        }
                }
                part {
-                       name: "img.camera";
+                       name: "img.camera.circle.line";
                        type: IMAGE;
                        scale: 1;
                        description {
                                state: "default" 0.0;
+                               fixed: 1 1;
+                               rel1 { relative: 0.5 0.5; to: "bg"; }
+                               rel2 { relative: 0.5 0.5; to: "bg"; }
                                min: CAMERA_ICON_SIZE CAMERA_ICON_SIZE;
                                max: CAMERA_ICON_SIZE CAMERA_ICON_SIZE;
+                               image.normal: "lock_circle_line_camera.png";
+                               visible: 0;
+                       }
+                       description {
+                               state: "release" 0.0;
+                               inherit: "default" 0.0;
+                               min: CAMERA_ICON_SIZE CAMERA_ICON_SIZE;
+                               max: CAMERA_ICON_SIZE CAMERA_ICON_SIZE;
+                               visible: 0;
+                       }
+                       description {
+                               state: "press" 0.0;
+                               inherit: "default" 0.0;;
+                               min: CAMERA_LAYOUT_SIZE CAMERA_LAYOUT_SIZE;
+                               max: CAMERA_LAYOUT_SIZE CAMERA_LAYOUT_SIZE;
+                               visible: 1;
+                       }
+               }
+               part {
+                       name: "img.camera.circle.drag";
+                       type: IMAGE;
+                       description {
+                               state: "default" 0.0;
                                fixed: 1 1;
+                               align: 0.5 0.5;
                                rel1 { relative: 0.5 0.5; to: "bg"; }
                                rel2 { relative: 0.5 0.5; to: "bg"; }
-                               image.normal: "quick_shot.png";
+                               min: 1 1;
+                               max: 1 1;
+                               image.normal: "lock_circle_line_camera_drag.png";
+                               visible: 0;
+                       }
+                       description {
+                               state: "release" 0.0;
+                               inherit: "default" 0.0;
+                               min: 1 1;
+                               max: 1 1;
+                               visible: 0;
+                       }
+                       description {
+                               state: "press" 0.0;
+                               inherit: "default" 0.0;;
                                visible: 1;
+                       }
+               }
+               part {
+                       name: "img.camera.bg";
+                       type: IMAGE;
+                       scale: 1;
+                       description {
+                               state: "default" 0.0;
+                               min: CAMERA_ICON_SIZE CAMERA_ICON_SIZE;
+                               max: CAMERA_ICON_SIZE CAMERA_ICON_SIZE;
+                               fixed: 1 1;
+                               rel1 { relative: 0.5 0.5; to: "bg"; }
+                               rel2 { relative: 0.5 0.5; to: "bg"; }
+                               image.normal: "quick_shot_bg.png";
+                               color_class: "AO001";
+                       }
+                       description {
+                               state: "release" 0.0;
+                               inherit: "default" 0.0;
+                               color_class: "AO001";
+                       }
+                       description {
+                               state: "press" 0.0;
+                               inherit: "default" 0.0;;
+                               color_class: "AO001P";
+                       }
+               }
+               part {
+                       name: "img.camera.icon";
+                       type: IMAGE;
+                       scale: 1;
+                       repeat_events: 1;
+                       description {
+                               state: "default" 0.0;
+                               min: CAMERA_ICON_SIZE CAMERA_ICON_SIZE;
+                               max: CAMERA_ICON_SIZE CAMERA_ICON_SIZE;
+                               fixed: 1 1;
+                               rel1 { relative: 0.5 0.5; to: "img.camera.bg"; }
+                               rel2 { relative: 0.5 0.5; to: "img.camera.bg"; }
+                               image.normal: "quick_shot_icon.png";
                                map {
                                        on: 1;
                                        rotation {
@@ -53,42 +140,149 @@ group {
                                        }
                                }
                        }
-                       description {
-                               state: "release" 0.0;
-                               inherit: "default" 0.0;
-                               visible: 1;
-                       }
-                       description {
-                               state: "press" 0.0;
-                               inherit: "default" 0.0;;
-                               image.normal: "quick_shot_press.png";
-                       }
                }
        }
        programs {
+               script{
+                       public use_custom;
+                       public g_mouse_down;
+                       public g_full_state;
+                       public g_angle;
+                       public g_angle_new;
+                       public g_angle_old;
+                       public g_angle_busy;
+                       public g_anim_fill_enable;
+                       public g_filler_expanded;
+               }
+               program {
+                       name: "init,layout";
+                       signal: "load";
+                       source: "";
+                       script {
+                               set_int(g_mouse_down, 0);
+                               set_int(g_angle, 0);
+                               set_int(g_angle_new, 0);
+                               set_int(g_angle_busy, 0);
+                               set_int(g_anim_fill_enable, 0);
+                               set_int(g_full_state, 0);
+                               set_int(g_filler_expanded, 0);
+                               set_int(use_custom, 0);
+                       }
+               }
+               program {
+                       name: "rotation,end";
+                       script {
+                               new angle_old;
+                               new angle_new;
+
+                               angle_old = get_int(g_angle);
+                               angle_new = get_int(g_angle_new);
+
+                               if (angle_old != angle_new) {
+                                       set_int(g_angle_busy, 1);
+                               } else {
+                                       set_int(g_angle_busy, 0);
+                               }
+                       }
+               }
                program {
                        signal: "mouse,down,1";
-                       source: "img.camera";
-                       action: SIGNAL_EMIT "camera,icon,mouse,down" "img.camera";
+                       source: "img.camera.bg";
+                       action: SIGNAL_EMIT "camera,icon,mouse,down" "img.camera.bg";
+                       script {
+                               set_int(g_mouse_down, 1);
+                       }
                }
                program {
                        name: "camera,icon,press";
                        signal: "camera,icon,press";
-                       source: "img.camera";
+                       source: "img.camera.bg";
                        action: STATE_SET "press" 0.0;
-                       target: "img.camera";
+                       target: "img.camera.bg";
+                       target: "img.camera.circle.drag";
+                       after: "camera,circle,start";
+               }
+               program {
+                       name: "camera,circle,start";
+                       source: "img.camera.circle.line";
+                       action: STATE_SET "press" 0.0;
+                       target: "img.camera.circle.line";
+                       transition: SIN_FAC 0.5 1.7;
                }
                program {
                        signal: "mouse,up,1";
-                       source: "img.camera";
-                       action: SIGNAL_EMIT "camera,icon,mouse,up" "img.camera";
+                       source: "img.camera.bg";
+                       action: SIGNAL_EMIT "camera,icon,mouse,up" "img.camera.bg";
+                       script {
+                               set_int(g_mouse_down, 0);
+                       }
+
                }
                program {
                        name: "camera,icon,release";
                        signal: "camera,icon,release";
-                       source: "img.camera";
+                       source: "img.camera.bg";
+                       action: STATE_SET "release" 0.0;
+                       target: "img.camera.bg";
+                       after: "camera,circle,end";
+               }
+               program {
+                       name: "camera,circle,end";
+                       source: "img.camera.circle.line";
                        action: STATE_SET "release" 0.0;
-                       target: "img.camera";
+                       target: "img.camera.circle.line";
+                       target: "img.camera.circle.drag";
+                       transition: SIN_FAC 0.5 1.7;
+               }
+               program {
+                       signal: "mouse,move";
+                       source: "img.camera.icon";
+                       script {
+                               new x;
+                               new y;
+                               get_mouse(x, y);
+
+                               if (get_int(g_mouse_down) == 0) {
+                                       return ;
+                               }
+
+                               new x_icon;
+                               new y_icon;
+                               new w_icon;
+                               new h_icon;
+                               get_geometry(PART:"img.camera.icon", x_icon, y_icon, w_icon, h_icon);
+
+                               new x_max;
+                               new y_max;
+                               new w_max;
+                               new h_max;
+                               get_geometry(PART:"bg", x_max, y_max, w_max, h_max);
+
+                               new Float:d_x;
+                               new Float:d_y;
+                               d_x = abs((x_icon + (w_icon / 2) - x) * 2);
+                               d_y = abs((y_icon + (h_icon / 2) - y) * 2);
+
+                               new min = round(sqrt((d_x * d_x) + (d_y * d_y)));
+
+                               min = (min > w_max) ? w_max : min;
+                               min = (min < w_icon) ? w_icon : min;
+
+                               custom_state(PART:"img.camera.circle.drag", "press", 0.0);
+                               set_state_val(PART:"img.camera.circle.drag", STATE_MIN, min, min);
+                               set_state_val(PART:"img.camera.circle.drag", STATE_MAX, min, min);
+                               set_state(PART:"img.camera.circle.drag", "custom", 0.0);
+
+                               if (min >= w_max) {
+                                       if (get_int(g_full_state) == 0) {
+                                               stop_programs_on(PART:"img.camera.circle.line");
+                                       }
+                                       set_int(g_full_state, 1);
+                               } else {
+                                       set_int(g_full_state, 0);
+                               }
+                               set_int(g_filler_expanded, 1);
+                       }
                }
        }
 }
index 53090b7..056a332 100644 (file)
@@ -43,4 +43,24 @@ color_classes {
                name: "ATO007";
                color: 255 255 255 255;
        }
+       color_class {
+               name: "AO001";
+               color: 100 100 100 100;
+       }
+       color_class {
+               name: "AO001P";
+               color: 50 50 50 200;
+       }
+       color_class {
+               name: "AO002";
+               color: 150 150 150 150;
+       }
+       color_class {
+               name: "AO005";
+               color: 100 100 100 100;
+       }
+       color_class {
+               name: "AO002L1";
+               color: 200 200 200 100;
+       }
 }
index 7afa5a5..0afbd38 100644 (file)
@@ -18,15 +18,16 @@ group {
        styles {
                style {
                        name: "time_style_contextual";
-                       base: "style=far_shadow,bottom shadow_color=#00000033 font=SamsungNeoNum-3T:style=Regular color=#FFFFFF font_size=28 align=center wrap=none";
+                       base: "style=far_shadow,bottom shadow_color=#00000033 font=SamsungNeoNum-3T:style=Regular color=#FFFFFF font_size=32 align=center wrap=none";
                }
                style {
                        name: "close_style";
-                       base: "font=Tizen:style=Regular color=#FFFFFF font_size=21 wrap=none align=center";
+                       base: "font=Tizen:style=Regular color=#FFFFFF font_size=32 wrap=none align=center";
                }
        }
        images {
                image: "event_close_bg.#.png" COMP;
+               image: "miss_noti_bg.#.png" COMP;
        }
        name: "contextual-event";
        parts {
@@ -40,13 +41,38 @@ group {
                        }
                }
                part {
-                       name: "txt.date";
-                       type: TEXTBLOCK;
+                       name: "img.event.area.bg";
+                       type: IMAGE;
+                       description {
+                               state: "default" 0.0;
+                               align: 0.0 0.0;
+                               rel1 { relative: CONTEXTUAL_INFO_PADDING_LEFT/WIN_WIDTH CONTEXTUAL_INFO_DATE_HEIGHT/CONTEXTUAL_INFO_HEIGHT; to: "bg"; }
+                               rel2 { relative: (WIN_WIDTH - CONTEXTUAL_INFO_PADDING_RIGHT)/WIN_WIDTH CONTEXTUAL_INFO_EVENT_AREA_HEIGHT/CONTEXTUAL_INFO_HEIGHT; to: "bg"; }
+                               image {
+                                       normal: "miss_noti_bg.#.png";
+                               }
+                               color_class: "AO002";
+                       }
+               }
+               part {
+                       name: "rect.time.date.info";
+                       type: SPACER;
                        description {
                                state: "default" 0.0;
                                align: 0.0 0.0;
                                rel1 { relative: 0.0 0.0; to: "bg"; }
                                rel2 { relative: 1.0 CONTEXTUAL_INFO_DATE_HEIGHT/CONTEXTUAL_INFO_HEIGHT; to: "bg"; }
+                       }
+               }
+               part {
+                       name: "txt.date";
+                       type: TEXTBLOCK;
+                       scale: 1;
+                       description {
+                               state: "default" 0.0;
+                               align: 0.0 0.0;
+                               rel1 { relative: 0.0 0.0; to_x: "bg"; to_y: "rect.time.date.info"; offset: 0 10; }
+                               rel2 { relative: 1.0 0.0; to_x: "bg"; to_y: "rect.time.date.info"; offset: 0 10;}
                                text {
                                        style: "time_style_contextual";
                                        align: 0.5 0.5;
@@ -57,25 +83,25 @@ group {
                        }
                }
                part {
-                       name: "rect.event.area.bg";
-                       type: RECT;
+                       name: "rect.close.btn";
+                       type: SPACER;
                        description {
                                state: "default" 0.0;
-                               color: 150 150 150 150;
                                align: 0.0 0.0;
-                               rel1 { relative: 0.0 CONTEXTUAL_INFO_DATE_HEIGHT/CONTEXTUAL_INFO_HEIGHT; to: "bg"; }
-                               rel2 { relative: 1.0 (CONTEXTUAL_INFO_DATE_HEIGHT + CONTEXTUAL_INFO_EVENT_AREA_HEIGHT)/CONTEXTUAL_INFO_HEIGHT; to: "bg"; }
+                               rel1 { relative: CONTEXTUAL_INFO_PADDING_LEFT/WIN_WIDTH  CONTEXTUAL_INFO_DATE_HEIGHT/CONTEXTUAL_INFO_HEIGHT; to: "bg"; }
+                               rel2 { relative: (WIN_WIDTH - CONTEXTUAL_INFO_PADDING_RIGHT)/WIN_WIDTH (CONTEXTUAL_INFO_DATE_HEIGHT + 13 + CONTEXTUAL_INFO_CLOSE_BTN_HEIGHT + 13)/CONTEXTUAL_INFO_HEIGHT; to: "bg"; }
                        }
                }
                part {
                        name: "txt.close";
                        type: TEXTBLOCK;
+                       scale: 1;
                        repeat_events: 1;
                        description {
                                state: "default" 0.0;
-                               align: 1.0 0.0;
-                               rel1 { relative: 1.0 0.0; to_x: "bg"; to_y: "rect.event.area.bg"; offset: -20 6; }
-                               rel2 { relative: 1.0 0.0; to_x: "bg"; to_y: "rect.event.area.bg"; offset: -20 6; }
+                               align: 1.0 0.5;
+                               rel1 { relative: 1.0 0.5; to: "rect.close.btn"; offset: -32 0; }
+                               rel2 { relative: 1.0 0.5; to: "rect.close.btn"; offset: -32 0; }
                                text {
                                        style: "close_style";
                                        min: 1 1;
@@ -91,12 +117,12 @@ group {
                        description {
                                state: "default" 0.0;
                                align: 1.0 0.0;
-                               color: 100 100 100 100;
                                rel1 { to: "txt.close"; offset: -10 0; }
                                rel2 { to: "txt.close"; offset: 10 0; }
                                image {
                                        normal: "event_close_bg.#.png";
                                }
+                               color_class: "AO005";
                        }
                        description {
                                state: "press" 0.0;
@@ -107,12 +133,13 @@ group {
                part {
                        name: "sw.scroller";
                        type: SWALLOW;
+                       scale: 1;
                        description {
                                state: "default" 0.0;
                                fixed: 1 1;
                                align: 0.0 0.0;
-                               rel1 { relative: 0.0 1.0; to_x: "bg"; to_y: "btn.close"; offset: 0 6; }
-                               rel2 { relative: 1.0 1.0; to_x: "bg"; to_y: "rect.event.area.bg"; }
+                               rel1 { relative: CONTEXTUAL_INFO_PADDING_LEFT/WIN_WIDTH 1.0; to_x: "bg"; to_y: "rect.close.btn"; }
+                               rel2 { relative: (WIN_WIDTH - CONTEXTUAL_INFO_PADDING_RIGHT)/WIN_WIDTH 1.0; to_x: "bg"; to_y: "img.event.area.bg"; }
                        }
                }
                part {
@@ -121,8 +148,8 @@ group {
                        description {
                                state: "default" 0.0;
                                align: 0.0 0.0;
-                               rel1 { relative: 0.0 (CONTEXTUAL_INFO_DATE_HEIGHT+CONTEXTUAL_INFO_EVENT_AREA_HEIGHT)/CONTEXTUAL_INFO_HEIGHT; to: "bg"; }
-                               rel2 { relative: 1.0 (CONTEXTUAL_INFO_DATE_HEIGHT+CONTEXTUAL_INFO_EVENT_AREA_HEIGHT+CONTEXTUAL_INFO_PAGE_INDICATOR_HEIGHT)/CONTEXTUAL_INFO_HEIGHT; to: "bg"; }
+                               rel1 { relative: 0.0 CONTEXTUAL_INFO_EVENT_AREA_HEIGHT/CONTEXTUAL_INFO_HEIGHT; to: "bg"; }
+                               rel2 { relative: 1.0 (CONTEXTUAL_INFO_EVENT_AREA_HEIGHT + 10 + CONTEXTUAL_INFO_PAGE_INDICATOR_HEIGHT)/CONTEXTUAL_INFO_HEIGHT; to: "bg"; }
                        }
                }
                part {
@@ -131,9 +158,8 @@ group {
                        description {
                                state: "default" 0.0;
                                align: 0.5 0.5;
-                               fixed: 1 1;
-                               rel1 { relative: 0.5 0.5; to: "rect.index"; }
-                               rel2 { relative: 0.5 0.5; to: "rect.index"; }
+                               rel1 { relative: 0.0 0.0; to: "rect.index"; }
+                               rel2 { relative: 1.0 1.0; to: "rect.index"; }
                                visible: 1;
                        }
                        description {
@@ -183,9 +209,6 @@ group {
 
 group {
        name: "missed-event-page";
-       images {
-               image: "event_list_divider.#.png" COMP;
-       }
        parts {
                part {
                        name: "bg";
@@ -203,29 +226,20 @@ group {
                                state: "default" 0.0;
                                align: 0.0 0.0;
                                rel1 { relative: 0.0 0.0; to: "bg"; }
-                               rel2 { relative: 1.0 90/CONTEXTUAL_INFO_PAGE_HEIGHT; to: "bg"; }
+                               rel2 { relative: 1.0 MISSED_EVT_ITEM_HEIGHT/CONTEXTUAL_INFO_PAGE_HEIGHT; to: "bg"; }
                        }
                }
                part {
-                       name: "img.separator";
-                       type: IMAGE;
+                       name: "rect.separator";
+                       type: RECT;
                        description {
                                state: "default" 0.0;
                                min: 1 1;
                                fixed: 1 1;
-                               color: 0 0 0 255;
                                align: 0.0 0.0;
-                               rel1 { relative: 10/WIN_WIDTH 90/CONTEXTUAL_INFO_PAGE_HEIGHT; to: "bg"; }
-                               rel2 { relative: (WIN_WIDTH-10)/WIN_WIDTH (90+MISSED_EVT_SEPARATOR_HEIGHT)/CONTEXTUAL_INFO_PAGE_HEIGHT; to: "bg"; }
-                               visible: 0;
-                               image {
-                                       normal: "event_list_divider.#.png";
-                               }
-                       }
-                       description {
-                               state: "show" 0.0;
-                               inherit: "default" 0.0;
-                               visible: 1;
+                               rel1 { relative: CONTEXTUAL_INFO_PADDING_LEFT/WIN_WIDTH 1.0; to_x: "bg"; to_y: "sw.content.top"; }
+                               rel2 { relative: (WIN_WIDTH - CONTEXTUAL_INFO_PADDING_RIGHT)/WIN_WIDTH 1.0; to_x: "bg"; to_y: "sw.content.top"; }
+                               color_class: "AO002L1";
                        }
                }
                part {
@@ -234,27 +248,11 @@ group {
                        description {
                                state: "default" 0.0;
                                align: 0.0 0.0;
-                               rel1 { relative: 0.0 (90+MISSED_EVT_SEPARATOR_HEIGHT)/CONTEXTUAL_INFO_PAGE_HEIGHT; to: "bg"; }
-                               rel2 { relative: 1.0 (90+MISSED_EVT_SEPARATOR_HEIGHT+90)/CONTEXTUAL_INFO_PAGE_HEIGHT; to: "bg"; }
+                               rel1 { relative: 0.0 MISSED_EVT_ITEM_HEIGHT/CONTEXTUAL_INFO_PAGE_HEIGHT; to: "bg"; }
+                               rel2 { relative: 1.0 (MISSED_EVT_ITEM_HEIGHT*2)/CONTEXTUAL_INFO_PAGE_HEIGHT; to: "bg"; }
                        }
                }
        }
-       programs {
-               program {
-                       name: "show,separator";
-                       signal: "show,separator";
-                       source: "img.separator";
-                       action: STATE_SET "show" 0.0;
-                       target: "img.separator";
-               }
-               program {
-                       name: "hide,separator";
-                       signal: "hide,separator";
-                       source: "img.separator";
-                       action: STATE_SET "default" 0.0;
-                       target: "img.separator";
-               }
-       }
 }
 
 group {
diff --git a/data/edje/images/enter_pin_dot.png b/data/edje/images/enter_pin_dot.png
new file mode 100644 (file)
index 0000000..467db33
Binary files /dev/null and b/data/edje/images/enter_pin_dot.png differ
diff --git a/data/edje/images/lock_circle_line_camera.png b/data/edje/images/lock_circle_line_camera.png
new file mode 100644 (file)
index 0000000..9330235
Binary files /dev/null and b/data/edje/images/lock_circle_line_camera.png differ
diff --git a/data/edje/images/lock_circle_line_camera_drag.png b/data/edje/images/lock_circle_line_camera_drag.png
new file mode 100644 (file)
index 0000000..0971827
Binary files /dev/null and b/data/edje/images/lock_circle_line_camera_drag.png differ
diff --git a/data/edje/images/ls_back_02_nor.png b/data/edje/images/ls_back_02_nor.png
new file mode 100644 (file)
index 0000000..7a8f607
Binary files /dev/null and b/data/edje/images/ls_back_02_nor.png differ
diff --git a/data/edje/images/ls_back_02_press.png b/data/edje/images/ls_back_02_press.png
new file mode 100644 (file)
index 0000000..7426dfc
Binary files /dev/null and b/data/edje/images/ls_back_02_press.png differ
diff --git a/data/edje/images/ls_icon_call.png b/data/edje/images/ls_icon_call.png
new file mode 100644 (file)
index 0000000..18bf92a
Binary files /dev/null and b/data/edje/images/ls_icon_call.png differ
diff --git a/data/edje/images/ls_password_underline.#.png b/data/edje/images/ls_password_underline.#.png
new file mode 100644 (file)
index 0000000..9b6944b
Binary files /dev/null and b/data/edje/images/ls_password_underline.#.png differ
diff --git a/data/edje/images/ls_pin_dot.png b/data/edje/images/ls_pin_dot.png
new file mode 100644 (file)
index 0000000..c01ca7c
Binary files /dev/null and b/data/edje/images/ls_pin_dot.png differ
diff --git a/data/edje/images/miss_noti_bg.#.png b/data/edje/images/miss_noti_bg.#.png
new file mode 100644 (file)
index 0000000..fe970b5
Binary files /dev/null and b/data/edje/images/miss_noti_bg.#.png differ
diff --git a/data/edje/images/quick_button_icon_bg.png b/data/edje/images/quick_button_icon_bg.png
new file mode 100755 (executable)
index 0000000..392389c
Binary files /dev/null and b/data/edje/images/quick_button_icon_bg.png differ
diff --git a/data/edje/images/quick_shot_bg.png b/data/edje/images/quick_shot_bg.png
new file mode 100644 (file)
index 0000000..19cc91c
Binary files /dev/null and b/data/edje/images/quick_shot_bg.png differ
diff --git a/data/edje/images/quick_shot_icon.png b/data/edje/images/quick_shot_icon.png
new file mode 100644 (file)
index 0000000..4221723
Binary files /dev/null and b/data/edje/images/quick_shot_icon.png differ
index bb1729f..41a5453 100755 (executable)
  * limitations under the License.
  */
 
-#define WIN_WIDTH 540
-#define WIN_HEIGHT 960
+#define WIN_WIDTH 720
+#define WIN_HEIGHT 1280
 
-#define INDICATOR_HEIGHT 38
+#define INDICATOR_HEIGHT 52
 
 #define SWIPE_LOCK_PADDING_TOP 10
-#define SWIPE_LOCK_PADDING_BOTTOM 32
-#define SWIPE_LOCK_PADDING_LEFT 18
-#define SWIPE_LOCK_PADDING_RIGHT 18
+#define SWIPE_LOCK_PADDING_BOTTOM 38
+#define SWIPE_LOCK_PADDING_LEFT 38
+#define SWIPE_LOCK_PADDING_RIGHT 38
 #define SWIPE_LOCK_EFFECT_HEIGHT 130
 
-#define CONTEXTUAL_INFO_HEIGHT 314
-#define CONTEXTUAL_INFO_DATE_HEIGHT 44
-#define CONTEXTUAL_INFO_CLOSE_BTN_HEIGHT 41
-#define CONTEXTUAL_INFO_PAGE_HEIGHT 181
+#define CONTEXTUAL_INFO_PADDING_LEFT 11
+#define CONTEXTUAL_INFO_PADDING_RIGHT CONTEXTUAL_INFO_PADDING_LEFT
+#define CONTEXTUAL_INFO_DATE_HEIGHT 69
+#define CONTEXTUAL_INFO_CLOSE_BTN_HEIGHT 47
+#define CONTEXTUAL_INFO_PAGE_HEIGHT (130*2)//MISSED_EVT_ITEM_HEIGHT*2
 #define CONTEXTUAL_INFO_PAGE_INDICATOR_HEIGHT 48
-#define CONTEXTUAL_INFO_EVENT_AREA_HEIGHT (CONTEXTUAL_INFO_PAGE_HEIGHT+CONTEXTUAL_INFO_CLOSE_BTN_HEIGHT)
+//#define CONTEXTUAL_INFO_EVENT_AREA_HEIGHT (CONTEXTUAL_INFO_DATE_HEIGHT+13+CONTEXTUAL_INFO_CLOSE_BTN_HEIGHT+13+CONTEXTUAL_INFO_PAGE_HEIGHT)
+#define CONTEXTUAL_INFO_EVENT_AREA_HEIGHT 402
+//#define CONTEXTUAL_INFO_HEIGHT (CONTEXTUAL_INFO_EVENT_AREA_HEIGHT+10+CONTEXTUAL_INFO_PAGE_INDICATOR_HEIGHT)
+#define CONTEXTUAL_INFO_HEIGHT 512
+#define MISSED_EVT_ITEM_WIDTH 698
+#define MISSED_EVT_ITEM_HEIGHT 130
+#define MISSED_EVT_ITEM_PADDING_LEFT 26
+#define MISSED_EVT_ITEM_PADDING_RIGHT MISSED_EVT_ITEM_PADDING_LEFT
+#define MISSED_EVT_ITEM_PADDING_TOP 16
+#define MISSED_EVT_ITEM_PADDING_BOTTOM MISSED_EVT_ITEM_PADDING_TOP
+#define MISSED_EVT_ITEM_TEXT_TOP_HEIGHT 54
+#define MISSED_EVT_ITEM_TEXT_BOTTOM_HEIGHT 43
 
-#define MISSED_EVT_ITEM_HEIGHT 90
-#define MISSED_EVT_ITEM_PADDING_LEFT 15
-#define MISSED_EVT_ITEM_PADDING_RIGHT 15
-#define MISSED_EVT_ITEM_PADDING_TOP 8
-#define MISSED_EVT_ITEM_PADDING_BOTTOM 8
-
-#define MISSED_EVT_SEPARATOR_WIDTH (540-20)
+#define MISSED_EVT_SEPARATOR_WIDTH (WIN_WIDTH-CONTEXTUAL_INFO_PADDING_LEFT-CONTEXTUAL_INFO_PADDING_RIGHT)
 #define MISSED_EVT_SEPARATOR_HEIGHT 1
 
-#define MISSED_EVT_ICON_SIZE 55
+#define MISSED_EVT_ICON_LAYOUT_SIZE 105
+#define MISSED_EVT_ICON_IMG_SIZE 98
+#define MISSED_EVT_ICON_SUB_SIZE 45
 
-#define CAMERA_LAYOUT_SIZE 280
-#define CAMERA_ICON_SIZE 110
+#define CAMERA_LAYOUT_SIZE 802
+#define CAMERA_ICON_SIZE 124
 
 collections {
-       base_scale: 1.7;
+       base_scale: 2.6;
 
 #include "color_classes.edc"
 #include "swipe_lock.edc"
@@ -91,6 +99,7 @@ collections {
                        part {
                                name: "music_dim";
                                type: RECT;
+                               clip_to: "vi_clipper";
                                description {
                                        state: "default" 0.0;
                                        rel1 { relative: 0.0 0.0; to : "sw.bg";}
index b48c6b7..2863fda 100644 (file)
  * limitations under the License.
  */
 
-#define ITEM_TITLE_HEIGHT 27
-
 group {
        styles {
                style {
-                       name: "variable_style";
-                       base: "font=Tizen:style=Regular color=#FFFFFFFF color_class=ATO009 font_size=24 text_class=ATO009 align=right ellipsis=1.0";
-               }
-               style {
                        name: "title_style";
-                       base: "font=Tizen:style=Regular color=#FFFFFFFF color_class=ATO039 font_size=30 text_class=ATO039 ellipsis=1.0";
+                       base: "font=Tizen:style=Regular color=#FFFFFFFF color_class=ATO014 font_size=40 text_class=ATO014 ellipsis=1.0";
                }
                style {
                        name: "content_style";
-                       base: "font=Tizen:style=Regular color=#FFFFFFFF color_class=ATO010 font_size=24 text_class=ATO010 ellipsis=1.0";
+                       base: "font=Tizen:style=Regular color=#FFFFFFFF color_class=ATO015 font_size=32 text_class=ATO015 ellipsis=1.0";
                }
                style {
                        name: "time_style";
-                       base: "font=Tizen:style=Regular color=#FFFFFFFF color_class=ATO010 font_size=24 text_class=ATO010 align=right";
+                       base: "font=Tizen:style=Regular color=#FFFFFFFF color_class=ATO016 font_size=32 text_class=ATO016 align=right";
+               }
+               style {
+                       name: "variable_style";
+                       base: "font=Tizen:style=Regular color=#FFFFFFFF color_class=ATO016 font_size=32 text_class=ATO016 align=right ellipsis=1.0";
                }
                style {
                        name: "selected_style";
-                       base: "font=Tizen:style=Regular color=#FFFFFFFF color_class=ATO039 font_size=30 text_class=ATO039 wrap=mixed";
+                       base: "font=Tizen:style=Regular color=#FFFFFFFF color_class=ATO039 font_size=40 text_class=ATO039 wrap=mixed";
                }
        }
-       images {
-               image: "event_list_bg.#.png" COMP;
-       }
        name: "missed-event-item";
        parts {
                part {
                        name: "bg";
-                       type: RECT;
+                       type: SPACER;
                        mouse_events: 1;
                        repeat_events: 1;
                        description {
                                state: "default" 0.0;
-                               color:  0 0 0 0;
                        }
                }
                part {
@@ -60,19 +54,20 @@ group {
                        description {
                                state: "default" 0.0;
                                align: 0.0 0.0;
-                               rel1 { relative: 12/WIN_WIDTH 17/MISSED_EVT_ITEM_HEIGHT; to: "bg"; }
-                               rel2 { relative: (12+MISSED_EVT_ICON_SIZE)/WIN_WIDTH (17+MISSED_EVT_ICON_SIZE)/MISSED_EVT_ITEM_HEIGHT; to: "bg"; }
+                               rel1 { relative: MISSED_EVT_ITEM_PADDING_LEFT/MISSED_EVT_ITEM_WIDTH MISSED_EVT_ITEM_PADDING_TOP/MISSED_EVT_ITEM_HEIGHT; to: "bg"; }
+                               rel2 { relative: (MISSED_EVT_ITEM_PADDING_LEFT + MISSED_EVT_ICON_LAYOUT_SIZE)/MISSED_EVT_ITEM_WIDTH (MISSED_EVT_ITEM_PADDING_TOP + MISSED_EVT_ICON_LAYOUT_SIZE)/MISSED_EVT_ITEM_HEIGHT; to: "bg"; }
                        }
                }
                part {
                        name: "txt.title";
                        type: TEXTBLOCK;
+                       scale: 1;
                        description {
                                state: "default" 0.0;
                                fixed: 1 1;
                                align: 0.0 0.5;
-                               rel1 { relative: (12+MISSED_EVT_ICON_SIZE+12)/WIN_WIDTH 8/MISSED_EVT_ITEM_HEIGHT; to: "bg"; }
-                               rel2 { relative: 0.0 (8+41)/MISSED_EVT_ITEM_HEIGHT; to_x: "txt.time"; to_y: "bg"; offset: -14 0; }
+                               rel1 { relative: (MISSED_EVT_ITEM_PADDING_LEFT + MISSED_EVT_ICON_LAYOUT_SIZE + 25)/MISSED_EVT_ITEM_WIDTH MISSED_EVT_ITEM_PADDING_TOP/MISSED_EVT_ITEM_HEIGHT; to: "bg"; }
+                               rel2 { relative: 0.0 (MISSED_EVT_ITEM_PADDING_TOP + MISSED_EVT_ITEM_TEXT_TOP_HEIGHT)/MISSED_EVT_ITEM_HEIGHT; to_x: "txt.time"; to_y: "bg"; offset: -32 0; }
                                text {
                                        style: "title_style";
                                        min: 0 1;
@@ -94,14 +89,15 @@ group {
                part {
                        name: "txt.content";
                        type: TEXTBLOCK;
+                       scale: 1;
                        mouse_events: 1;
                        repeat_events: 1;
                        description {
                                state: "default" 0.0;
                                fixed: 1 1;
                                align: 0.0 0.5;
-                               rel1 { relative: (12+MISSED_EVT_ICON_SIZE+12)/WIN_WIDTH (8+41)/MISSED_EVT_ITEM_HEIGHT; to: "bg"; }
-                               rel2 { relative: 0.0 (8+41+33)/MISSED_EVT_ITEM_HEIGHT; to_x: "txt.time"; to_y: "bg"; offset: -14 0; }
+                               rel1 { relative: (MISSED_EVT_ITEM_PADDING_LEFT + MISSED_EVT_ICON_LAYOUT_SIZE + 25)/MISSED_EVT_ITEM_WIDTH (MISSED_EVT_ITEM_PADDING_TOP + MISSED_EVT_ITEM_TEXT_TOP_HEIGHT)/MISSED_EVT_ITEM_HEIGHT; to: "bg"; }
+                               rel2 { relative: 0.0 (MISSED_EVT_ITEM_PADDING_TOP + MISSED_EVT_ITEM_TEXT_TOP_HEIGHT + MISSED_EVT_ITEM_TEXT_BOTTOM_HEIGHT)/MISSED_EVT_ITEM_HEIGHT; to_x: "txt.time"; to_y: "bg"; offset: -32 0; }
                                text {
                                        style: "content_style";
                                        text: "";
@@ -123,6 +119,7 @@ group {
                part {
                        name: "txt.selected.message";
                        type: TEXTBLOCK;
+                       scale: 1;
                        description {
                                state: "default" 0.0;
                                fixed: 1 1;
@@ -145,14 +142,15 @@ group {
                part {
                        name: "txt.variable";
                        type: TEXTBLOCK;
+                       scale: 1;
                        mouse_events: 1;
                        repeat_events: 1;
                        description {
                                state: "default" 0.0;
                                fixed: 1 1;
                                align: 1.0 0.0;
-                               rel1 { relative: 0.0 8/MISSED_EVT_ITEM_HEIGHT; to_x: "txt.time"; to_y: "bg"; }
-                               rel2 { relative: 1.0 (8+41)/MISSED_EVT_ITEM_HEIGHT; to_x: "txt.time"; to_y: "bg"; }
+                               rel1 { relative: 0.0 MISSED_EVT_ITEM_PADDING_TOP/MISSED_EVT_ITEM_HEIGHT; to_x: "txt.time"; to_y: "bg"; }
+                               rel2 { relative: 1.0 (MISSED_EVT_ITEM_PADDING_TOP + MISSED_EVT_ITEM_TEXT_TOP_HEIGHT)/MISSED_EVT_ITEM_HEIGHT; to_x: "txt.time"; to_y: "bg"; }
                                text {
                                        style: "variable_style";
                                        min: 0 1;
@@ -178,14 +176,15 @@ group {
                part {
                        name: "txt.time";
                        type: TEXTBLOCK;
+                       scale: 1;
                        mouse_events: 1;
                        repeat_events: 1;
                        description {
                                state: "default" 0.0;
                                fixed: 1 1;
                                align: 1.0 0.0;
-                               rel1 { relative: (WIN_WIDTH-14)/WIN_WIDTH (8+41)/MISSED_EVT_ITEM_HEIGHT; to: "bg"; }
-                               rel2 { relative: (WIN_WIDTH-14)/WIN_WIDTH (8+41+33)/MISSED_EVT_ITEM_HEIGHT; to: "bg"; }
+                               rel1 { relative: (MISSED_EVT_ITEM_WIDTH - MISSED_EVT_ITEM_PADDING_RIGHT)/MISSED_EVT_ITEM_WIDTH (MISSED_EVT_ITEM_PADDING_TOP + MISSED_EVT_ITEM_TEXT_TOP_HEIGHT)/MISSED_EVT_ITEM_HEIGHT; to: "bg"; }
+                               rel2 { relative: (MISSED_EVT_ITEM_WIDTH - MISSED_EVT_ITEM_PADDING_RIGHT)/MISSED_EVT_ITEM_WIDTH (MISSED_EVT_ITEM_PADDING_TOP + MISSED_EVT_ITEM_TEXT_TOP_HEIGHT + MISSED_EVT_ITEM_TEXT_BOTTOM_HEIGHT)/MISSED_EVT_ITEM_HEIGHT; to: "bg"; }
                                text {
                                        style: "time_style";
                                        min: 1 1;
@@ -268,3 +267,70 @@ group {
                }
        }
 }
+
+group {
+       name: "missed-event-item-icon";
+       images {
+               image: "quick_button_icon_bg.png" COMP;
+       }
+       parts {
+               part {
+                       name: "bg";
+                       type: SPACER;
+                       scale: 1;
+                       description {
+                               state: "default" 0.0;
+                               fixed: 1 1;
+                               min: MISSED_EVT_ICON_LAYOUT_SIZE MISSED_EVT_ICON_LAYOUT_SIZE;
+                               max: MISSED_EVT_ICON_LAYOUT_SIZE MISSED_EVT_ICON_LAYOUT_SIZE;
+                               rel1 { relative: 0.0 0.0; }
+                               rel2 { relative: 1.0 1.0; }
+                       }
+               }
+               part {
+                       name: "clipper";
+                       type: IMAGE;
+                       scale: 1;
+                       precise_is_inside: 1;
+                       description {
+                               state: "default" 0.0;
+                               fixed : 1 1;
+                               align: 0 0;
+                               min: MISSED_EVT_ICON_IMG_SIZE MISSED_EVT_ICON_IMG_SIZE;
+                               max: MISSED_EVT_ICON_IMG_SIZE MISSED_EVT_ICON_IMG_SIZE;
+                               rel1 { relative: 0.0 0.0; }
+                               rel2 { relative: 0.0 0.0; }
+                               image.normal: "quick_button_icon_bg.png";
+                       }
+               }
+               part {
+                       name: "sw.icon";
+                       type: SWALLOW;
+                       scale: 1;
+                       clip_to: "clipper";
+                       description {
+                               state: "default" 0.0;
+                               fixed: 1 1;
+                               align: 0.5 0.5;
+                               min: MISSED_EVT_ICON_IMG_SIZE MISSED_EVT_ICON_IMG_SIZE;
+                               max: MISSED_EVT_ICON_IMG_SIZE MISSED_EVT_ICON_IMG_SIZE;
+                               rel1 { to: "clipper"; }
+                               rel2 { to: "clipper"; }
+                       }
+               }
+               part {
+                       name: "sw.icon.sub";
+                       type: SWALLOW;
+                       scale: 1;
+                       description {
+                               state: "default" 0.0;
+                               fixed: 1 1;
+                               align: 1 1;
+                               min: MISSED_EVT_ICON_SUB_SIZE MISSED_EVT_ICON_SUB_SIZE;
+                               max: MISSED_EVT_ICON_SUB_SIZE MISSED_EVT_ICON_SUB_SIZE;
+                               rel1 { relative: 1.0 1.0; }
+                               rel2 { relative: 1.0 1.0; }
+                       }
+               }
+       }
+}
index e5a0b64..f4cae1d 100644 (file)
@@ -18,13 +18,13 @@ group {
        styles {
                style {
                        name: "time_style_default";
-                       base: "style=far_shadow,bottom shadow_color=#00000033 font=SamsungNeoNum-3T:style=Regular color=#FFFFFF font_size=102 wrap=none";
-                       tag: "small_font" "+ font_size=40 font=SamsungNeoNum-3T:style=Light";
+                       base: "style=far_shadow,bottom shadow_color=#00000033 font=SNum-3T:style=Light color=#FFFFFF font_size=136 wrap=none text_class=tizen";
+                       tag: "small_font" "+ font_size=35 font=SNum-3T:style=Light";
                }
                style {
-                       name: "date_style_default";
-                       base: "style=far_shadow,bottom shadow_color=#00000033 font=Tizen:style=Regular font_size=30 color=#FFFFFF wrap=none align=left text_class=ATO003";
-                       tag: "small_font" "+ font_size=24";
+                       name: "date_and_battery_style_default";
+                       base: "style=far_shadow,bottom shadow_color=#00000033 font=Tizen:style=Regular font_size=35 color=#FFFFFF wrap=none align=left text_class=tizen";
+                       tag: "small_font" "+ font_size=35";
                }
        }
        name: "swipe-lock";
@@ -148,6 +148,7 @@ group {
                part {
                        name: "txt.time";
                        type: TEXTBLOCK;
+                       scale: 1;
                        clip_to: "vi_clipper";
                        description {
                                state: "default" 0.0;
@@ -167,6 +168,7 @@ group {
                part {
                        name: "txt.date";
                        type: TEXTBLOCK;
+                       scale: 1;
                        clip_to: "vi_clipper";
                        description {
                                state: "default" 0.0;
@@ -175,7 +177,7 @@ group {
                                rel1 { relative: 1.0 1.0; to_x: "padding.left"; to_y: "txt.time"; offset: 0 -13; }
                                rel2 { relative: 1.0 1.0; to_x: "padding.left"; to_y: "txt.time"; offset: 0 -13; }
                                text {
-                                       style: "date_style_default";
+                                       style: "date_and_battery_style_default";
                                        align: 0.5 0.5;
                                        min: 1 1;
                                        ellipsis: -1;
@@ -184,47 +186,31 @@ group {
                        }
                }
                part {
-                       name: "padding.txt.battery";
-                       type: SPACER;
-                       scale: 1;
-                       description {
-                               state: "default" 0.0;
-                               min: WIN_WIDTH 62;
-                               max: WIN_WIDTH 62;
-                               fixed: 1 1;
-                               align: 0 0;
-                               rel1 { relative: 1.0 1.0; to_x: "padding.left"; to_y: "txt.date"; }
-                               rel2 { relative: 1.0 1.0; to_x: "padding.left"; to_y: "txt.date"; }
-                       }
-               }
-               part {
                        name: "txt.battery";
-                       type: TEXT;
+                       type: TEXTBLOCK;
                        scale: 1;
                        clip_to: "vi_clipper";
                        description {
                                state: "default" 0.0;
-                               min: 314 40;
-                               max: 314 40;
-                               fixed: 1 1;
                                align: 0 0;
+                               fixed: 1 1;
                                visible: 1;
-                               rel1 { relative: 1.0 1.0; to_x: "padding.left"; to_y: "padding.txt.battery"; }
-                               rel2 { relative: 1.0 1.0; to_x: "padding.left"; to_y: "padding.txt.battery"; }
+                               rel1 { relative: 1.0 1.0; to_x: "padding.left"; to_y: "txt.date"; offset: 0 115; }
+                               rel2 { relative: 1.0 1.0; to_x: "padding.left"; to_y: "txt.date"; offset: 0 115; }
                                text {
+                                       style: "date_and_battery_style_default";
                                        align: 0.0 0.5;
                                        min: 1 1;
                                        ellipsis: -1;
                                        text: "Charging: 50%";
-                                       size: 28;
                                }
                        }
                        description {
                                state: "contextual_event" 0.0;
                                inherit: "default" 0.0;
                                align: 0 0;
-                               rel1 { relative: 1.0 1.0; to_x: "padding.left"; to_y: "sw.contextual_event"; offset: 0 5; }
-                               rel2 { relative: 1.0 1.0; to_x: "padding.left"; to_y: "sw.contextual_event"; offset: 0 5; }
+                               rel1 { relative: 1.0 1.0; to_x: "padding.left"; to_y: "sw.contextual_event"; offset: 0 17; }
+                               rel2 { relative: 1.0 1.0; to_x: "padding.left"; to_y: "sw.contextual_event"; offset: 0 17; }
                        }
                        description {
                                state: "hide" 0.0;
@@ -233,33 +219,17 @@ group {
                        }
                }
                part {
-                       name: "padding.txt.plmn";
-                       type: SPACER;
-                       scale: 1;
-                       description {
-                               state: "default" 0.0;
-                               min: WIN_WIDTH 14;
-                               max: WIN_WIDTH 14;
-                               fixed: 1 1;
-                               align: 0 1;
-                               rel1 { relative: 1.0 0.0; to_x: "padding.left"; to_y: "padding.bottom"; }
-                               rel2 { relative: 1.0 0.0; to_x: "padding.left"; to_y: "padding.bottom"; }
-                       }
-               }
-               part {
                        name: "txt.plmn";
                        type: SWALLOW;
                        scale: 1;
                        clip_to: "vi_clipper";
                        description {
                                state: "default" 0.0;
-                               min: 314 40;
-                               max: 314 40;
                                fixed: 1 1;
                                align: 0 1;
                                visible: 1;
-                               rel1 { relative: 1.0 0.0; to_x: "padding.left"; to_y: "padding.txt.plmn"; }
-                               rel2 { relative: 1.0 0.0; to_x: "padding.left"; to_y: "padding.txt.plmn"; }
+                               rel1 { relative: 1.0 0.0; to_x: "padding.left"; to_y: "padding.bottom"; offset: 0 -41; }
+                               rel2 { relative: 1.0 0.0; to_x: "padding.left"; to_y: "padding.bottom"; offset: 0 -41; }
                        }
                        description {
                                state: "hide" 0.0;
@@ -274,12 +244,10 @@ group {
                        clip_to: "vi_clipper";
                        description {
                                state: "default" 0.0;
-                               min: CAMERA_LAYOUT_SIZE CAMERA_LAYOUT_SIZE;
-                               max: CAMERA_LAYOUT_SIZE CAMERA_LAYOUT_SIZE;
-                               align: 1 1;
+                               align: 0.5 0.5;
                                fixed: 1 1;
-                               rel1 { relative: 0.0 0.0; to_x: "padding.right"; to_y: "padding.bottom"; offset: 85 85; }
-                               rel2 { relative: 0.0 0.0; to_x: "padding.right"; to_y: "padding.bottom"; offset: 85 85; }
+                               rel1 { relative: 220/WIN_WIDTH (WIN_HEIGHT-500)/WIN_HEIGHT; to: "bg"; }
+                               rel2 { relative: (220+CAMERA_LAYOUT_SIZE)/WIN_WIDTH (WIN_HEIGHT-500+CAMERA_LAYOUT_SIZE)/WIN_HEIGHT; to: "bg"; }
                        }
                }
        }
diff --git a/data/images/ls_noti_ic_call.png b/data/images/ls_noti_ic_call.png
new file mode 100644 (file)
index 0000000..40b1b02
Binary files /dev/null and b/data/images/ls_noti_ic_call.png differ
diff --git a/data/images/ls_noti_ic_msg.png b/data/images/ls_noti_ic_msg.png
new file mode 100644 (file)
index 0000000..7b8bda6
Binary files /dev/null and b/data/images/ls_noti_ic_msg.png differ
diff --git a/include/camera.h b/include/camera.h
new file mode 100644 (file)
index 0000000..085d454
--- /dev/null
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2009-2014 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __CAMERA_H__
+#define __CAMERA_H__
+
+#define APP_NAME_CAMERA "org.tizen.camera-app"
+
+typedef enum {
+       CAMERA_VIEW_DRAGGING_START = 1,
+       CAMERA_VIEW_DRAGGING_STOP = 2,
+       CAMERA_VIEW_ROTATE = 3,
+       CAMERA_VIEW_MAX,
+} camera_view_type_e;
+
+Evas_Object *lock_camera_layout_get(void);
+
+lock_error_e lock_camera_above_win_state_send(Eina_Bool state);
+void lock_camera_app_launch(void);
+lock_error_e lock_camera_view_action(camera_view_type_e action, int angle);
+Evas_Object *lock_camera_layout_create(Evas_Object *parent);
+void lock_camera_layout_destroy(void);
+
+#endif
diff --git a/include/contextual_event.h b/include/contextual_event.h
new file mode 100644 (file)
index 0000000..3ba0d2a
--- /dev/null
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2009-2014 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __CONTEXTUAL_EVENT_H__
+#define __CONTEXTUAL_EVENT_H__
+
+#include <notification.h>
+
+#include "music_player.h"
+#include "missed_event.h"
+
+#define LOCK_CONTEXTUAL_PAGE_TYPE_KEY "__contextual_page_type__"
+
+typedef enum {
+       LOCK_CONTEXTUAL_TYPE_NONE = 0,
+       LOCK_CONTEXTUAL_TYPE_MISSED_EVENT = 1,
+       LOCK_CONTEXTUAL_TYPE_MUSIC = 2,
+       LOCK_CONTEXTUAL_TYPE_MAX,
+} contextual_type_e;
+
+Evas_Object *lock_contextual_event_layout_get(void);
+Evas_Object *lock_contextual_event_scroller_get(void);
+Evas_Object *lock_contextual_event_scroller_box_get(void);
+Eina_Bool lock_contextual_event_layout_visible_get(void);
+
+int lock_contextual_event_page_count_get(void);
+int lock_contextual_event_current_page_get(void);
+Evas_Object *lock_contextual_event_page_get(contextual_type_e type);
+Evas_Object *lock_contextual_event_page_create(Evas_Object *parent, contextual_type_e type);
+
+lock_error_e lock_contextual_event_music_add(music_state_e state, const char *name, int width, int height);
+void lock_contextual_event_music_del(void);
+
+Evas_Object *lock_contextual_event_missed_event_item_find(missed_event_type_e type);
+lock_error_e lock_contextual_event_missed_event_item_add(Evas_Object *item, missed_event_type_e type);
+void lock_contextual_event_missed_event_item_del(missed_event_type_e type);
+void lock_contextual_event_missed_event_del(void);
+
+Evas_Object *lock_contextual_event_layout_create(Evas_Object *parent);
+lock_error_e lock_contextual_event_layout_del(void);
+
+#endif
index 59263bd..bd46f61 100755 (executable)
@@ -18,7 +18,6 @@
 #define __LOCKSCREEN_H__
 
 #include <Elementary.h>
-//#include <Ecore_X.h>
 #include <Evas.h>
 #include <stdbool.h>
 
 
 #define LOCK_EDJE_FILE EDJE_DIR"lockscreen.edj"
 
-#define LOCK_DEFAULT_BG_PATH "/usr/apps/org.tizen.setting/shared/res/settings/Wallpapers/Home_default.jpg"
+#ifdef TIZEN_BUILD_EMULATOR
+#define LOCK_DEFAULT_BG_PATH "/opt/share/settings/Wallpapers/Default.jpg"
+#else
+#define LOCK_DEFAULT_BG_PATH "/opt/share/settings/Wallpapers/Lock_default.png"
+#endif
 
 #define _EDJ(x) elm_layout_edje_get(x)
 #define _X(x) ELM_SCALE_SIZE(x)
 
 #define _NOT_LOCALIZED(str) (str)
 
-static const int BUF_SIZE = 1024;
+#define BUF_SIZE_64 64
+#define BUF_SIZE_512 512
+#define BUF_SIZE_1024 1024
 
 typedef enum {
        LOCK_TYPE_NONE = 0,
@@ -57,7 +62,7 @@ typedef enum {
        LOCK_ERROR_MAX,
 } lock_error_e;
 
-Elm_Theme *lockscreen_theme_get(void);
+void lockscreen_exit(void);
 int lockscreen_setting_lock_type_get(void);
 Ecore_Timer *lockscreen_lcd_off_timer_get(void);
 
@@ -69,4 +74,5 @@ void lockscreen_lcd_off_count_reset(void);
 
 void lockscreen_feedback_tap_play(void);
 
+
 #endif
diff --git a/include/missed_event.h b/include/missed_event.h
new file mode 100644 (file)
index 0000000..538efd1
--- /dev/null
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2009-2014 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MISSED_EVENT_H__
+#define __MISSED_EVENT_H__
+
+#define LOCK_CONTEXTUAL_MISSED_EVENT_TYPE_KEY "__missed_event_type__"
+#define LOCK_CONTEXTUAL_MISSED_EVENT_IS_SELECTED_KEY "__missed_event_is_selected_type__"
+#define LOCK_CONTEXTUAL_MISSED_EVENT_BUNDLE_KEY "__missed_event_bundle__"
+
+#define APP_NAME_CALL "org.tizen.phone"
+#define APP_NAME_CONTACTS "org.tizen.contacts"
+#define APP_NAME_MSG "org.tizen.message"
+
+#define ICON_PATH_MISSED_EVENT_MSG "/usr/apps/org.tizen.quickpanel/shared/res/noti_icons/Contact/noti_contact_default.png"
+#define ICON_PATH_MISSED_EVENT_CALL ICON_PATH_MISSED_EVENT_MSG
+
+typedef enum {
+       LOCK_MISSED_EVENT_TYPE_NONE = 0,
+       LOCK_MISSED_EVENT_TYPE_CALL = 1,
+       LOCK_MISSED_EVENT_TYPE_MSG = 2,
+       LOCK_MISSED_EVENT_TYPE_MAX,
+} missed_event_type_e;
+
+Evas_Object *lock_missed_event_selected_item_get(void);
+
+void lock_missed_event_item_launch(void);
+void lock_missed_event_item_disabled_set(Eina_Bool disabled);
+void lock_missed_event_item_selected_unset(void);
+void lock_missed_event_item_destroy(Evas_Object *item);
+
+lock_error_e lock_missed_event_noti_cb_register(void);
+void lock_missed_event_noti_cb_unregister(void);
+
+#endif
diff --git a/include/music_player.h b/include/music_player.h
new file mode 100644 (file)
index 0000000..7e95fba
--- /dev/null
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2009-2014 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __MUSIC_PLAYER_H__
+#define __MUSIC_PLAYER_H__
+
+#define MUSIC_PLAYER_NAME "[music-minicontrol.LOCKSCREEN]"
+#define SOUND_PLAYER_NAME "[sound-minicontrol.LOCKSCREEN]"
+#define MUSIC_PLAYER "org.tizen.music-player"
+#define SOUND_PLAYER "org.tizen.sound-player"
+#define LOCK_MUSIC_PLAYER_MINICONTROL_NAME_KEY "__minicontrol_name__"
+
+typedef enum {
+       MUSIC_STATE_NO_MUSIC = 0,
+       MUSIC_STATE_MUSIC_PLAYER_ON = 1,
+       MUSIC_STATE_SOUND_PLAYER_ON = 2,
+       MUSIC_STATE_MAX,
+} music_state_e;
+
+typedef enum {
+       READ_FILE_ERROR_NONE = 0,
+       READ_FILE_ERROR_EOF = 1,
+       READ_FILE_ERROR_ERROR = 2,
+       READ_FILE_MAX,
+} read_file_error_e;
+
+music_state_e lock_music_player_state_get(void);
+Evas_Object *lock_music_player_minicontroller_get(void);
+
+void lock_music_player_bg_set(Evas_Object *bg, music_state_e music_state);
+void lock_music_player_bg_unset(void);
+void lock_music_player_minicontroller_hide_event_send(void);
+Evas_Object *lock_music_player_minicontroller_create(music_state_e state, Evas_Object *layout, const char *name);
+void lock_music_player_minicontroller_destroy(void);
+
+#endif
diff --git a/include/page_indicator.h b/include/page_indicator.h
new file mode 100644 (file)
index 0000000..cea14cc
--- /dev/null
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2009-2014 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __PAGE_INDICATOR_H__
+#define __PAGE_INDICATOR_H__
+
+Evas_Object *lock_page_indicator_index_get(void);
+
+void lock_page_indicator_bring_in_page(int current_page);
+void lock_page_indicator_update(void);
+
+Evas_Object *lock_page_indicator_create(void);
+void lock_page_indicator_del(void);
+
+#endif
index f2a1012..60d02c3 100644 (file)
@@ -22,5 +22,6 @@ int lock_window_width_get(void);
 int lock_window_height_get(void);
 
 Evas_Object *lock_window_create(int type);
+void lock_window_destroy(void);
 
 #endif
index 277a397..13645da 100755 (executable)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest xmlns="http://tizen.org/ns/packages" package="org.tizen.lockscreen" version="0.1.0" install-location="internal-only" api-version="2.3.1">
        <label>lockscreen</label>
-       <author email="m.szczecinsk@partner.samsung.com" href="www.samsung.com">Michal Szczecinski</author>
+       <author email="gs86.lee@samsung.com" href="www.samsung.com">geunsun Lee</author>
        <description>lockscreen</description>
        <ui-application appid="org.tizen.lockscreen" exec="/usr/apps/org.tizen.lockscreen/bin/lockscreen" nodisplay="true" multiple="false" type="capp" taskmanage="false">
                <label>lockscreen</label>