From e20db9810a3b2412d8d740d8d8fe7d806376ec1f Mon Sep 17 00:00:00 2001 From: Priya Kohli Date: Tue, 27 Jun 2017 15:30:18 +0530 Subject: [PATCH] Changes in New Network UI as per latest specs Change-Id: I94f161af78fa13928f727f58500e8033ae1ce88d Signed-off-by: Priya Kohli --- res/layout/network.edc | 265 +++++++++++++++++++++---------------------------- 1 file changed, 111 insertions(+), 154 deletions(-) diff --git a/res/layout/network.edc b/res/layout/network.edc index 688d2cd..4adc3e7 100644 --- a/res/layout/network.edc +++ b/res/layout/network.edc @@ -1680,6 +1680,8 @@ group { state, "default" 0.0; rel1.relative, 0.0 0.0; rel2.relative, 1.0 1.0; + min, 1100 960; + max, 1100 960; visible, 0; } } @@ -1692,11 +1694,11 @@ group { state, "default" 0.0; color, 244 244 244 255; rel1 { - relative, 0.0510 0.0667;//0.0 0.0; + relative, 0.0 0.0; to, "area"; } rel2 { - relative, 0.9490 0.9111;//1.0 1.0; + relative, 1.0 1.0; to, "area"; } } @@ -1738,12 +1740,10 @@ group { relative, 1.0 1.0; } align, 0.5 0.5; - color, 51 51 51 255; + color, 0 0 0 255; text { - text, "Network"; - font, FONT_REGULAR; - size, 46; - /*style, "style.new_network.title";*/ + font, "BreezeSans Medium"; + size, 42; } } } @@ -1754,7 +1754,7 @@ group { scale, 1; description { state, "default" 0.0; - min, 0 58; + min, 0 0; rel1 { relative, 0.0 1.0; to, "part.title"; @@ -1773,7 +1773,7 @@ group { scale, 1; description { state, "default" 0.0; - min, 0 64; + min, 0 0; rel1 { to, "padding.button.area1"; relative, 0.0 1.0; @@ -1785,42 +1785,6 @@ group { } part { - name, "padding.new_network.btn.space"; - type, SPACER; - scale, 1; - description { - state, "default" 0.0; - min, 26 0; - rel1 { - to, "padding.button.area1"; - relative, 0.5 1.0; - } - rel2 { - to, "padding.button.area2"; - relative, 0.5 1.0; - } - fixed, 1 0; - } - } - - part { - name, "part.new_network.btn.dnsconfig"; - type, SWALLOW; - scale, 1; - description { - state, "default" 0.0; - min, 308 0; - rel1 { - to, "padding.new_network.btn.space"; - relative, 1.0 0.0; - } - rel2.to, "padding.new_network.btn.space"; - align, 0.0 0.5; - fixed, 1 0; - } - } - - part { name, "part.content.area"; type, SWALLOW; scale, 1; @@ -1840,31 +1804,13 @@ group { } } - /*part { - name, "part.new_network.action"; - type, RECT; - scale, 1; - description { - state, "default" 0.0; - min, 0 148; - rel1 { - to, "area"; - relative, 0.0 1.0; - } - rel2.to, "area"; - align, 0.5 1.0; - fixed, 0 1; - color, 255 255 255 255; - } - }*/ - part { name, "part.new_network.action"; type, RECT; scale, 1; description { state, "default" 0.0; - min, 0 148; + min, 0 72; rel1 { to, "area"; relative, 0.0510 0.8444; @@ -1876,6 +1822,7 @@ group { align, 0.0 1.0; fixed, 0 1; color, 255 255 255 255; + visible, 0; } } @@ -1905,7 +1852,7 @@ group { scale, 1; description { state, "default" 0.0; - min, 308 64; + min, 300 80; rel1 { to, "padding.new_network.btn.action_space"; relative, 0.0 0.5; @@ -1926,7 +1873,7 @@ group { description { state, "default" 0.0; color, 202 202 202 255; - min, 308 64; + min, 300 80; rel1 { to, "padding.new_network.btn.action_space"; relative, 1.0 0.5; @@ -2032,7 +1979,7 @@ group { name: "grp.layout.new_network"; scale, 1; description { state, "default" 0.0; - min, 0 80;//124; + min, 0 80; rel1 { to, "bg"; relative, 0.0 1.0; @@ -2071,13 +2018,13 @@ group { name: "grp.layout.new_network"; scale, 1; description { state, "default" 0.0; - min, 246 0; - rel1.to, "bg";//"padding.content.space"; + min, 428 0; + rel1.to, "bg"; rel2 { - to, "bg";//"padding.content.space"; - relative, 0.15 1.0; + to, "bg"; + relative, 0.0 1.0; } - align, 0.0 0.5;//1.0 0.5; + align, 0.0 0.5; fixed, 1 0; } } @@ -2088,7 +2035,7 @@ group { name: "grp.layout.new_network"; scale, 1; description { state, "default" 0.0; - min, 246 0; + min, 428 0; rel1 { to_x, "padding.content.space"; to_y, "part.content.left"; @@ -2124,11 +2071,11 @@ group { name: "grp.content.ip_setting"; state, "default" 0.0; color, 244 244 244 255; rel1 { - relative, 0.0510 0.0667;//0.0 0.0; + relative, 0.0510 0.0667; to, "area"; } rel2 { - relative, 0.9490 0.9111;//1.0 1.0; + relative, 0.9490 0.9111; to, "area"; } } @@ -2140,7 +2087,8 @@ group { name: "grp.content.ip_setting"; scale, 1; description { state, "default" 0.0; - min, 200 36; + min, 146 32; + max, 146 32; rel1 { to, "bg"; relative, 0.0 0.0; @@ -2152,12 +2100,12 @@ group { name: "grp.content.ip_setting"; align, 0.0 0.0; fixed, 0 1; text { - text, "IP Setting"; - font, "BreezeSans"; - size, 36; + text, "IP SETTING"; + font, "BreezeSans Medium"; + size, 28; align, 0 0; } - color, 77 77 77 255; + color, 0 0 0 128; } } @@ -2167,10 +2115,10 @@ group { name: "grp.content.ip_setting"; scale, 1; description { state, "default" 0.0; - min, 16 0; + min, 0 20; rel1 { to, "part.text.ip_setting"; - relative, 1.0 0.0; + relative, 0.0 1.0; } rel2.to, "part.text.ip_setting"; rel2.relative, 1.0 1.0; @@ -2185,13 +2133,14 @@ group { name: "grp.content.ip_setting"; scale, 1; description { state, "default" 0.0; - min, 400 0; + min, 428 80; + max, 428 80; rel1 { to, "padding.ip_dropdown"; - relative, 1.0 0.0; + relative, 0.0 1.0; } rel2.to, "padding.ip_dropdown"; - fixed, 1 0; + fixed, 0 1; align, 0.0 0.0; } } @@ -2202,12 +2151,12 @@ group { name: "grp.content.ip_setting"; scale, 1; description { state, "default" 0.0; - min, 0 75; + min, 0 28; rel1 { - to, "part.text.ip_setting"; + to, "part.ip.type"; relative, 0.0 1.0; } - rel2.to, "part.text.ip_setting"; + rel2.to, "part.ip.type"; fixed, 0 1; align, 0.0 0.0; } @@ -2219,21 +2168,22 @@ group { name: "grp.content.ip_setting"; scale, 1; description { state, "default" 0.0; - min, 0 32; + min, 300 28; + max, 300 28; rel1 { to, "padding.ip_setting"; - relative, 0.0 1.0;//0.5 1.0; + relative, 0.0 1.0; } rel2.to, "padding.ip_setting"; align, 0.0 0.0; fixed, 0 1; text { - text, "IP Address"; - font, "BreezeSans"; - size, 32; + text, "IP address"; + font, "BreezeSans Light"; + size, 24; align, 0 0; } - color, 116 116 116 255; + color, 0 0 0 204; } } @@ -2243,14 +2193,14 @@ group { name: "grp.content.ip_setting"; scale, 1; description { state, "default" 0.0; - min, 6 0; + min, 0 2; rel1 { to, "part.text.ip_address"; - relative, 1.0 0.0; + relative, 0.0 1.0; } rel2.to, "part.text.ip_address"; - fixed, 1 0; - align, 0.0 0.5; + fixed, 0 1; + align, 0.0 0.0; } } @@ -2260,10 +2210,11 @@ group { name: "grp.content.ip_setting"; scale, 1; description { state, "default" 0.0; - min, 446 0; + min, 428 80; + max, 428 80; rel1 { to, "padding.ip_address"; - relative, 1.0 0.0; + relative, 0.0 1.0; } rel2.to, "padding.ip_address"; @@ -2278,12 +2229,12 @@ group { name: "grp.content.ip_setting"; scale, 1; description { state, "default" 0.0; - min, 0 75; + min, 0 28; rel1 { - to, "part.text.ip_address";//"part.swallow.ip_address"; + to, "part.swallow.ip_address"; relative, 0.0 1.0; } - rel2.to, "part.text.ip_address";//"part.swallow.ip_address"; + rel2.to, "part.swallow.ip_address"; fixed, 0 1; align, 0.0 0.0; } @@ -2295,7 +2246,8 @@ group { name: "grp.content.ip_setting"; scale, 1; description { state, "default" 0.0; - min, 0 32; + min, 300 28; + max, 300 28; rel1 { to, "padding.ip_address_entry"; relative, 0.0 1.0; @@ -2305,11 +2257,11 @@ group { name: "grp.content.ip_setting"; fixed, 0 1; text { text, "Subnet Mask"; - font, "BreezeSans"; - size, 32; + font, "BreezeSans Light"; + size, 24; align, 0 0; } - color, 116 116 116 255; + color, 0 0 0 204; } } @@ -2319,14 +2271,14 @@ group { name: "grp.content.ip_setting"; scale, 1; description { state, "default" 0.0; - min, 6 0; + min, 0 2; rel1 { to, "part.text.subnet"; - relative, 1.0 0.0;//0.0 1.0; + relative, 0.0 1.0; } rel2.to, "part.text.subnet"; - fixed, 1 0;//0 1; - align, 0.0 0.5;//0.0 0.0; + fixed, 0 1; + align, 0.0 0.0; } } @@ -2336,13 +2288,13 @@ group { name: "grp.content.ip_setting"; scale, 1; description { state, "default" 0.0; - min, 446 0; + min, 428 80; rel1 { to, "padding.subnet_title"; - relative, 1.0 0.0;//0.0 1.0; + relative, 0.0 1.0; } rel2.to, "padding.subnet_title"; - fixed, 1 1;//1 1; + fixed, 1 1; align, 0.0 0.0; } } @@ -2353,12 +2305,12 @@ group { name: "grp.content.ip_setting"; scale, 1; description { state, "default" 0.0; - min, 0 75; + min, 0 28; rel1 { - to, "part.text.subnet";//"part.swallow.subnet"; + to, "part.swallow.subnet"; relative, 0.0 1.0; } - rel2.to,"part.text.subnet";// "part.swallow.subnet"; + rel2.to, "part.swallow.subnet"; fixed, 0 1; align, 0.0 0.0; } @@ -2370,7 +2322,8 @@ group { name: "grp.content.ip_setting"; scale, 1; description { state, "default" 0.0; - min, 0 32; + min, 300 28; + max, 300 28; rel1 { to, "padding.subnet_entry"; relative, 0.0 1.0; @@ -2380,11 +2333,11 @@ group { name: "grp.content.ip_setting"; fixed, 0 1; text { text, "Gateway"; - font, "BreezeSans"; - size, 32; + font, "BreezeSans Light"; + size, 24; align, 0 0; } - color, 116 116 116 255; + color, 0 0 0 204; } } @@ -2394,14 +2347,14 @@ group { name: "grp.content.ip_setting"; scale, 1; description { state, "default" 0.0; - min, 6 0;//0 26; + min, 0 2; rel1 { to, "part.text.gateway"; - relative, 1.0 0.0;//0.0 1.0; + relative, 0.0 1.0; } rel2.to, "part.text.gateway"; - fixed, 1 0;//0 1; - align, 0.0 0.5; + fixed, 0 1; + align, 0.0 0.0; } } @@ -2411,13 +2364,14 @@ group { name: "grp.content.ip_setting"; scale, 1; description { state, "default" 0.0; - min, 446 0;//0 64; + min, 428 80; + max, 428 80; rel1 { to, "padding.gateway_title"; - relative, 1.0 0.0;//0.0 1.0; + relative, 0.0 1.0; } rel2.to, "padding.gateway_title"; - fixed, 1 0;//0 1; + fixed, 0 1; align, 0.0 0.0; } } @@ -2462,7 +2416,8 @@ group { name: "grp.content.dns_setting"; scale, 1; description { state, "default" 0.0; - min, 0 36; + min, 146 32; + max, 428 32; rel1 { to, "bg"; relative, 0.0 0.0; @@ -2472,14 +2427,14 @@ group { name: "grp.content.dns_setting"; relative, 1.0 0.0; } align, 0.0 0.0; - fixed, 1 0;//1 1; + fixed, 0 1; text { - text, "DNS Setting"; - font, "BreezeSans"; - size, 36; - align, 0.0 0.0; + text, "DNS SETTING"; + font, "BreezeSans Medium"; + size, 28; + align, 0 0; } - color, 77 77 77 255; + color, 0 0 0 128; } } @@ -2489,10 +2444,10 @@ group { name: "grp.content.dns_setting"; scale, 1; description { state, "default" 0.0; - min, 16 0;//36; + min, 0 20; rel1 { to, "part.text.dns_setting"; - relative, 1.0 0.0; + relative, 0.0 1.0; } rel2.to, "part.text.dns_setting"; rel2.relative, 1.0 1.0; @@ -2507,13 +2462,14 @@ group { name: "grp.content.dns_setting"; scale, 1; description { state, "default" 0.0; - min, 400 0; + min, 428 80; + max, 428 80; rel1 { to, "padding.dns_dropdown"; - relative, 1.0 0.0; + relative, 0.0 1.0; } rel2.to, "padding.dns_dropdown"; - fixed, 1 0; + fixed, 0 1; align, 0.0 0.0; } } @@ -2524,12 +2480,12 @@ group { name: "grp.content.dns_setting"; scale, 1; description { state, "default" 0.0; - min, 0 75; + min, 0 28; rel1 { - to, "part.text.dns_setting"; + to, "part.dns.type"; relative, 0.0 1.0; } - rel2.to, "part.text.dns_setting"; + rel2.to, "part.dns.type"; fixed, 0 1; align, 0.0 0.0; } @@ -2541,22 +2497,22 @@ group { name: "grp.content.dns_setting"; scale, 1; description { state, "default" 0.0; - min, 0 32; + min, 300 28; + max, 300 28; rel1 { to, "padding.dns_setting"; relative, 0.0 1.0; } rel2.to, "padding.dns_setting"; - align, 0.0 0.0; fixed, 0 1; text { text, "DNS Server"; - font, "BreezeSans"; - size, 32; + font, "BreezeSans Light"; + size, 24; align, 0 0; } - color, 116 116 116 255; + color, 0 0 0 204; } } @@ -2566,13 +2522,13 @@ group { name: "grp.content.dns_setting"; scale, 1; description { state, "default" 0.0; - min, 0 0;//0 26; + min, 0 2; rel1 { to, "part.text.dns_address"; - relative, 1.0 0.0;//0.0 1.0; + relative, 0.0 1.0; } rel2.to, "part.text.dns_address"; - fixed, 1 0;//0 1; + fixed, 0 1; align, 0.0 0.0; } } @@ -2583,13 +2539,14 @@ group { name: "grp.content.dns_setting"; scale, 1; description { state, "default" 0.0; - min, 446 0; + min, 428 80; + max, 428 80; rel1 { to, "padding.dns_address"; - relative, 1.0 0.0;//0.0 1.0; + relative, 0.0 1.0; } rel2.to, "padding.dns_address"; - fixed, 1 0;//0 1; + fixed, 0 1; align, 0.0 0.0; } } -- 2.7.4