From 50c73879b07c74d324b530f28edc87ea0f22e5a7 Mon Sep 17 00:00:00 2001 From: Eugene Kurzberg Date: Thu, 27 Oct 2016 10:26:47 +0300 Subject: [PATCH] Fixed minor issues in Dialer layouts. Change-Id: Ib75ba861b21db4413c8b69f185848a9fbd6ecb2a Signed-off-by: Eugene Kurzberg --- lib-phone/res/dialer/edje/dialer-layout.edc | 11 +++-------- .../res/dialer/edje/dialer-predictive-layout.edc | 23 +++++----------------- 2 files changed, 8 insertions(+), 26 deletions(-) diff --git a/lib-phone/res/dialer/edje/dialer-layout.edc b/lib-phone/res/dialer/edje/dialer-layout.edc index b1d88ae..32034b0 100644 --- a/lib-phone/res/dialer/edje/dialer-layout.edc +++ b/lib-phone/res/dialer/edje/dialer-layout.edc @@ -60,7 +60,6 @@ collections { parts { spacer { "spacer.flexible"; desc { "default"; - align: 0.0 0.0; rel2 { relative: 1.0 0.0; to_y: "rect.divider_line"; } } } @@ -77,12 +76,11 @@ collections { align: 1.0 0.5; min: ENTRY_LR 0; rel1 { relative: 1.0 0.0; } - rel2 { relative: 1.0 1.0; to_y: PART_PREDICTIVE; } + rel2 { relative: 1.0 0.0; to_y: PART_PREDICTIVE; } } } swallow { PART_ENTRY; desc { "default"; - align: 0.5 0.5; rel1 { relative: 1.0 0.5; to: "spacer.entry.left_middle"; } rel2 { relative: 0.0 0.5; to: "spacer.entry.right_middle"; } } @@ -97,7 +95,6 @@ collections { } rect { "rect.divider_bg"; desc { "default"; - align: 0.0 0.0; rel1.to: PART_KEYPAD; rel2.to: PART_KEYPAD; color_class: "divider_bg"; @@ -105,14 +102,13 @@ collections { } swallow { PART_KEYPAD; desc { "default"; - align: 0.0 0.0; rel1 { relative: 0.0 (1.0-KEYPAD_REL_H); to_y: "spacer.flexible"; } rel2 { relative: 1.0 1.0; to_y: "spacer.flexible"; } } } rect { "rect.divider_line"; scale; desc { "default"; - align: 0.0 1.0; + align: 0.5 1.0; min: 0 DIVIDER_WH; rel1 { relative: 0.0 0.0; to_y: "rect.actions"; } rel2 { relative: 1.0 0.0; to_y: "rect.actions"; } @@ -121,10 +117,9 @@ collections { } rect { "rect.actions"; scale; desc { "default"; - align: 0.0 1.0; + align: 0.5 1.0; min: 0 ACTIONS_H; rel1.relative: 0.0 1.0; - rel2.relative: 1.0 1.0; color_class: "actions_bg"; } } diff --git a/lib-phone/res/dialer/edje/dialer-predictive-layout.edc b/lib-phone/res/dialer/edje/dialer-predictive-layout.edc index 79a8ed2..fec8838 100644 --- a/lib-phone/res/dialer/edje/dialer-predictive-layout.edc +++ b/lib-phone/res/dialer/edje/dialer-predictive-layout.edc @@ -169,7 +169,6 @@ collections { desc { "default"; align: 0.0 0.5; min: ADD_TEXT_L 0; - rel1.relative: 0.0 0.0; rel2.relative: 0.0 1.0; } } @@ -178,7 +177,6 @@ collections { align: 1.0 0.5; min: ADD_ICON_R 0; rel1.relative: 1.0 0.0; - rel2.relative: 1.0 1.0; } } textblock { PART_ADD_TEXT; scale; repeat; @@ -211,7 +209,6 @@ collections { desc { "default"; align: 0.0 0.5; min: THUMBNAIL_LR 0; - rel1.relative: 0.0 0.0; rel2.relative: 0.0 1.0; } } @@ -234,16 +231,14 @@ collections { swallow { PART_SPEED_DIAL; repeat; desc { "default"; align: 0.0 0.5; - rel1 { relative: 1.0 0.0; to: "spacer.text.left"; } + rel1 { relative: 1.0 0.0; to_x: "spacer.text.left"; to_y: PART_NAME; } rel2 { relative: 1.0 1.0; to_x: "spacer.text.left"; to_y: PART_NAME; } } } textblock { PART_NAME; scale; repeat; desc { "default"; - align: 0.0 0.0; - min: 0 NAME_H; rel1 { relative: 1.0 0.0; to_x: PART_SPEED_DIAL; to_y: "spacer.text.left"; } - rel2 { relative: 0.0 0.0; to_x: PART_BUTTON_MORE; to_y: PART_NUMBER; } + rel2 { relative: 0.0 0.0; to_x: PART_BUTTON_MORE; to_y: PART_NUMBER; } text { align: 0.0 0.5; style: "name_style"; @@ -269,7 +264,6 @@ collections { desc { "default"; align: 1.0 0.5; rel1.relative: 1.0 0.0; - rel2.relative: 1.0 1.0; } } } @@ -305,7 +299,6 @@ collections { desc { "default"; align: 0.0 0.5; min: BUTTON_MORE_LR 0; - rel1.relative: 0.0 0.0; rel2.relative: 0.0 1.0; } } @@ -314,20 +307,15 @@ collections { align: 1.0 0.5; min: BUTTON_MORE_LR 0; rel1.relative: 1.0 0.0; - rel2.relative: 1.0 1.0; } } textblock { PART_COUNT; scale; repeat; desc { "default"; align: 0.5 1.0; min: 0 BUTTON_MORE_WH; - rel1.relative: 0.5 0.5; - rel2.relative: 0.5 0.5; - text { - min: 1 0; - ellipsis: -1; - style: "count_style"; - } + rel1.relative: 0.0 0.5; + rel2.relative: 1.0 0.5; + text.style: "count_style"; } } image { "image.arrow"; scale; repeat; @@ -366,7 +354,6 @@ collections { align: 1.0 0.5; min: SPEED_DIAL_R 0; rel1.relative: 1.0 0.0; - rel2.relative: 1.0 1.0; } } image { "image.bg"; scale; -- 2.7.4