Fixes TIVI-1105 - Dialer UI keypad rendered overlapping while calling
[profile/ivi/lemolo.git] / data / themes / includes / call.edc
index 48a4f55..537bf6a 100644 (file)
@@ -1,5 +1,5 @@
 group {
-   name: "elm/layout/dialer/call";
+   name: "elm/layout/ofono-efl/call";
 
    /*
     * Represents the dialer ongoing voice call(s) screen.
@@ -64,7 +64,7 @@ group {
       image: "ico_merge.png" COMP;
       image: "ico_swap.png" COMP;
       image: "ico_contacts.png" COMP;
-      image: "ico_multiparty.png" COMP;
+      image: "ico_arrow_right.png" COMP;
    }
 
    parts {
@@ -85,6 +85,21 @@ group {
          }
       }
 
+      part {
+         name: "notification.bar";
+         type: RECT;
+         mouse_events: 0;
+         description {
+            state: "default" 0.0;
+            color: 0 0 0 255;
+            rel1.relative: 0.0 0.0;
+            rel2 {
+               relative: 1.0 0.0;
+               offset: -1 NOTIFICATION_BAR_HEIGHT;
+            }
+         }
+      }
+
 #define SEPARATOR(id, clip, rely, offy, relto)                          \
       part {                                                            \
          name: "separator.dark."##id;                                   \
@@ -137,11 +152,13 @@ group {
          description {                                                  \
             state: "default" 0.0;                                       \
             rel1 {                                                      \
-               relative: 0.0 0.0;                                       \
+               to: "notification.bar";                                  \
+               relative: 0.0 1.0;                                       \
                offset: 0 (-SEPARATOR_HEIGHT + offy);                    \
             }                                                           \
             rel2 {                                                      \
-               relative: 1.0 0.0;                                       \
+               to: "notification.bar";                                  \
+               relative: 1.0 1.0;                                       \
                offset: -1 (CALL_HEIGHT + offy);                         \
             }                                                           \
          }                                                              \
@@ -180,19 +197,19 @@ group {
             state: "default" 0.0;                                       \
             color: 255 255 255 255;                                     \
             color_class: "action";                                      \
-            min: 80 80;                                                 \
-            max: 80 80;                                                 \
+            min: LIST_ICON_SIZE LIST_ICON_SIZE;                                \
+            max: LIST_ICON_SIZE LIST_ICON_SIZE;                         \
             rel1 {                                                      \
                to: "call."##id;                                         \
                relative: 1.0 0.0;                                       \
-               offset: -80 (BORDER_PADDING - 1);                        \
+               offset: (-LIST_ICON_SIZE - BORDER_PADDING) 0;            \
             }                                                           \
             rel2 {                                                      \
                to: "call."##id;                                         \
-               relative: 1.0 0.0;                                       \
-               offset: -1 141;                                          \
+               relative: 1.0 1.0;                                       \
+               offset: (-BORDER_PADDING -1) -1;                         \
             }                                                           \
-            image.normal: "ico_multiparty.png";                         \
+            image.normal: "ico_arrow_right.png";                        \
          }                                                              \
          description {                                                  \
             state: "pressed" 0.0;                                       \
@@ -279,7 +296,7 @@ group {
          description {                                                  \
             state: "multiparty" 0.0;                                    \
             inherit: "default" 0.0;                                     \
-            rel2.offset: (-80 - ITEM_PADDING) (ACTION_HEIGHT - 1);      \
+            rel2.offset: (-BORDER_PADDING - ITEM_PADDING -LIST_ICON_SIZE - 1) (ACTION_HEIGHT - 1); \
          }                                                              \
       }                                                                 \
       part {                                                            \
@@ -293,15 +310,24 @@ group {
             state: "default" 0.0;                                       \
             color: 255 255 255 255;                                     \
             color_class: "action";                                      \
-            rel1.to: "area."##id".name";                                \
-            rel2.to: "area."##id".name";                                \
+            rel1 {                                                      \
+               to: "elm.swallow.img."##id;                              \
+               relative: 1.0 0.0;                                       \
+               offset: ITEM_PADDING 0;                                  \
+            }                                                           \
+            rel2 {                                                      \
+               to: "area."##id".name";                                  \
+               relative: 1.0 1.0;                                       \
+               offset: -1 -CALL_TEXT_OFFSET;                            \
+            }                                                           \
             text {                                                      \
                text: "Gustavo Barbieri";                                \
                font: FONT_NORMAL;                                       \
-               size: SIZE_HUGE;                                         \
-               size_range: SIZE_TINY SIZE_HUGE;                         \
+               size: SIZE_MEDIUM;                                       \
+               size_range: SIZE_MEDIUM SIZE_MEDIUM;                     \
                fit: 1 1;                                                \
-               align: 0.0 0.5;                                          \
+               max: 0 1;                                                \
+               align: 0.0 1.0;                                          \
                ellipsis: 0.0;                                           \
             }                                                           \
          }                                                              \
@@ -326,14 +352,15 @@ group {
             fixed: 1 1;                                                 \
             align: 0.0 0.0;                                             \
             rel1 {                                                      \
-               to: "area."##id".name";                                  \
-               relative: 0.0 1.0;                                       \
-               offset: 0 -20;                                           \
+               to_x: "elm.swallow.img."##id;                            \
+               to_y: "elm.text."##id".name";                            \
+               relative: 1.0 1.0;                                       \
+               offset: ITEM_PADDING -SEPARATOR_HEIGHT;                  \
             }                                                           \
             rel2 {                                                      \
-               to: "area."##id".name";                                  \
-               relative: 0.0 1.0;                                       \
-               offset: 0 -1;                                            \
+               to: "elm.swallow.img."##id;                              \
+               relative: 1.0 1.0;                                       \
+               offset: ITEM_PADDING -1;                                 \
             }                                                           \
             text {                                                      \
                text: "calling...";                                      \
@@ -378,6 +405,78 @@ group {
          }                                                              \
       }                                                                 \
                                                                         \
+      part {                                                            \
+         name: "elm.swallow.border."##id;                               \
+         type: RECT;                                                    \
+         scale: 1;                                                      \
+         mouse_events: 0;                                               \
+         clip_to: "call."##id;                                          \
+         description {                                                  \
+            state: "default" 0.0;                                       \
+            color: 255 255 255 255;                                     \
+            color_class: "action";                                      \
+            rel1 {                                                      \
+               to: "elm.swallow.img."##id;                              \
+               relative: 0.0 0.0;                                       \
+               offset: -1 -1;                                           \
+            }                                                           \
+            rel2 {                                                      \
+               to: "elm.swallow.img."##id;                              \
+               relative: 1.0 1.0;                                       \
+               offset: 0 0;                                             \
+            }                                                           \
+         }                                                              \
+      }                                                                 \
+                                                                        \
+      part {                                                            \
+         name: "elm.swallow.img.bg".#id;                                \
+         type: RECT;                                                    \
+         scale: 1;                                                      \
+         mouse_events: 0;                                               \
+         clip_to: "call."##id;                                          \
+         description {                                                  \
+            state: "default" 0.0;                                       \
+            color: 255 255 255 255;                                     \
+            color_class: "dark";                                        \
+            rel1 {                                                      \
+               to: "elm.swallow.img."##id;                              \
+               relative: 0.0 0.0;                                       \
+               offset: 0 0;                                             \
+            }                                                           \
+            rel2 {                                                      \
+               to: "elm.swallow.img."##id;                              \
+               relative: 1.0 1.0;                                       \
+               offset: -1 -1;                                           \
+            }                                                           \
+         }                                                              \
+      }                                                                 \
+                                                                        \
+      part {                                                            \
+         name: "elm.swallow.img."##id;                                  \
+         type: SWALLOW;                                                 \
+         scale: 1;                                                      \
+         clip_to: "call."##id;                                          \
+         mouse_events: 0;                                               \
+         description {                                                  \
+            state: "default" 0.0;                                       \
+            visible: 1;                                                 \
+            min: CALL_PHOTO_SIZE CALL_PHOTO_SIZE;                       \
+            max: CALL_PHOTO_SIZE CALL_PHOTO_SIZE;                       \
+            rel1 {                                                      \
+               to: "area."##id."name";                                  \
+               relative: 0.0 0.0;                                       \
+               offset: 0 ITEM_PADDING;                                  \
+            }                                                           \
+            rel2 {                                                      \
+               to: "area."##id."name";                                  \
+               relative: 0.0 0.0;                                       \
+               offset: CALL_PHOTO_SIZE (CALL_PHOTO_SIZE + ITEM_PADDING); \
+            }                                                           \
+         }                                                             \
+                                                                       \
+      }                                                                 \
+                                                                       \
+                                                                        \
       programs {                                                        \
          program {                                                      \
             signal: "mouse,clicked,1";                                  \
@@ -398,6 +497,7 @@ group {
             transition: ACCELERATE 0.1;                                 \
             target: "elm.text."##id".name";                             \
          }                                                              \
+                                                                        \
       }
 
       CALL("1", 0);
@@ -1073,11 +1173,11 @@ group {
          description {
             state: "default" 0.0;
             color: 0 0 0 0;
-            min: WIDTH (ACTION_HEIGHT * 4);
-            max: WIDTH (ACTION_HEIGHT * 4); /* keep it tight centered */
+            min: WIDTH (HEIGHT - 2 * CALL_HEIGHT - 2 * ACTION_HEIGHT - 4 * SEPARATOR_HEIGHT);
+            max: WIDTH (HEIGHT - 2 * CALL_HEIGHT - 2 * ACTION_HEIGHT - 4 * SEPARATOR_HEIGHT); /* keep it tight centered */
             rel1 {
                relative: 0.0 0.0;
-               offset: 0 (-ACTION_HEIGHT * 4 - SEPARATOR_HEIGHT);
+               offset: 0 (-HEIGHT + 2 * CALL_HEIGHT + 2 * ACTION_HEIGHT + 3 * SEPARATOR_HEIGHT);
                to_y: "button.hide-keypad";
             }
             rel2 {
@@ -1130,7 +1230,7 @@ group {
             text {                                                      \
                text: label;                                             \
                font: FONT_NORMAL;                                       \
-               size: SIZE_HUGE;                                         \
+               size: SIZE_MEDIUM;                                       \
                align: 0.5 0.5;                                          \
             }                                                           \
          }                                                              \
@@ -1236,12 +1336,12 @@ group {
             rel1 {
                to_y: "button.hangup";
                relative: 0.0 -1.0;
-               offset: 0 (ACTION_HEIGHT * 4 + SEPARATOR_HEIGHT);
+               offset: 0 (HEIGHT - 2 * CALL_HEIGHT - 2 * ACTION_HEIGHT - 4 * SEPARATOR_HEIGHT);
             }
             rel2 {
                to_y: "button.hangup";
                relative: 1.0 0.0;
-               offset: -1 (ACTION_HEIGHT * 4 + SEPARATOR_HEIGHT - 1);
+               offset: -1 (HEIGHT - 2 * CALL_HEIGHT - 2 * ACTION_HEIGHT - 4 * SEPARATOR_HEIGHT - 1);
             }
          }
          description {
@@ -1292,7 +1392,7 @@ group {
             text {
                text: "Hide Keypad";
                font: FONT_NORMAL;
-               size: SIZE_HUGE;
+               size: SIZE_MEDIUM;
                align: 0.5 0.5;
             }
          }
@@ -1461,7 +1561,7 @@ group {
             text {
                text: "Answer";
                font: FONT_NORMAL;
-               size: SIZE_HUGE;
+               size: SIZE_MEDIUM;
                align: 0.5 0.5;
             }
          }
@@ -1563,7 +1663,7 @@ group {
             text {
                text: "Hangup";
                font: FONT_NORMAL;
-               size: SIZE_HUGE;
+               size: SIZE_MEDIUM;
                align: 0.5 0.5;
             }
          }
@@ -1662,8 +1762,8 @@ group {
             text {
                text: "Conference";
                font: FONT_NORMAL;
-               size: SIZE_HUGE;
-               size_range: SIZE_TINY SIZE_HUGE;
+               size: SIZE_MEDIUM;
+               size_range: SIZE_TINY SIZE_MEDIUM;
                fit: 1 1;
                align: 0.5 0.5;
                ellipsis: 0.0;
@@ -1744,7 +1844,7 @@ group {
             text {
                text: "Back";
                font: FONT_NORMAL;
-               size: SIZE_HUGE;
+               size: SIZE_MEDIUM;
                align: 0.5 0.5;
             }
          }
@@ -2020,17 +2120,21 @@ group {
             state: "default" 0.0;
             color: 255 255 255 255;
             color_class: "action";
-            align: 0.0 0.5;
-            rel1.offset: BORDER_PADDING 0;
-            rel2 {
+            rel1 {
+               to: "elm.swallow.waiting.photo";
                relative: 1.0 0.0;
-               offset: (-BORDER_PADDING - 1) (ACTION_HEIGHT - 1);
+               offset: ITEM_PADDING 0;
+            }
+            rel2 {
+               to: "notification.bar";
+               relative: 1.0 1.0;
+               offset: -BORDER_PADDING ACTION_HEIGHT;
             }
             text {
                text: "Someone";
                font: FONT_NORMAL;
-               size: SIZE_HUGE;
-               size_range: SIZE_TINY SIZE_HUGE;
+               size: SIZE_MEDIUM;
+               size_range: SIZE_TINY SIZE_MEDIUM;
                fit: 1 1;
                align: 0.0 0.5;
                ellipsis: 0.0;
@@ -2039,6 +2143,75 @@ group {
       }
 
       part {
+         name: "waiting.img.border";
+         type: RECT;
+         scale: 1;
+         mouse_events: 0;
+         clip_to: "clipper.waiting-visible";
+         description {
+            state: "default" 0.0;
+            color: 255 255 255 255;
+            color_class: "action";
+            rel1 {
+               to: "elm.swallow.waiting.photo";
+               relative: 0.0 0.0;
+               offset: -1 -1;
+            }
+            rel2 {
+               to: "elm.swallow.waiting.photo";
+               relative: 1.0 1.0;
+               offset: 0 0;
+            }
+         }
+      }
+
+      part {
+         name: "waiting.img.bg";
+         type: RECT;
+         scale: 1;
+         mouse_events: 0;
+         clip_to: "clipper.waiting-visible";
+         description {
+            state: "default" 0.0;
+            color: 255 255 255 255;
+            color_class: "dark";
+            rel1 {
+               to: "elm.swallow.waiting.photo";
+               relative: 0.0 0.0;
+               offset: 0 0;
+            }
+            rel2 {
+               to: "elm.swallow.waiting.photo";
+               relative: 1.0 1.0;
+               offset: -1 -1;
+            }
+         }
+      }
+
+      part {
+         name: "elm.swallow.waiting.photo";
+         type: SWALLOW;
+         scale: 1;
+         clip_to: "clipper.waiting-visible";
+         mouse_events: 0;
+         description {
+            state: "default" 0.0;
+            min: CALL_PHOTO_SIZE CALL_PHOTO_SIZE;
+            max: CALL_PHOTO_SIZE CALL_PHOTO_SIZE;
+            rel1 {
+               to: "notification.bar";
+               relative: 0.0 1.0;
+               offset: BORDER_PADDING ITEM_PADDING;
+            }
+            rel2 {
+               to: "notification.bar";
+               relative: 0.0 1.0;
+               offset: (CALL_PHOTO_SIZE + BORDER_PADDING) (CALL_PHOTO_SIZE + ITEM_PADDING);
+            }
+         }
+      }
+
+      part {
          name: "label.waiting";
          type: TEXT;
          mouse_events: 0;
@@ -2141,7 +2314,7 @@ group {
 }
 
 group {
-   name: "elm/layout/dialer/activecall";
+   name: "elm/layout/ofono-efl/activecall";
 
    /*
     * Represents the active call in the other screens (not callscreen)
@@ -2242,3 +2415,26 @@ group {
       }
    }
 }
+
+group {
+
+   name: "elm/icon/multiparty/default";
+
+   images{
+      image: "ico_multiparty.png" COMP;
+   }
+
+   parts {
+      part {
+         name : "base";
+         scale: 1;
+         description {
+            state: "default" 0.0;
+            aspect: 1.0 1.0;
+            color_class: "action";
+            aspect_preference: BOTH;
+            image.normal: "ico_multiparty.png";
+         }
+      }
+   }
+}