diff options
author | liuxd <xd123.liu@samsung.com> | 2017-08-23 23:17:27 -0400 |
---|---|---|
committer | Jihoon Kim <jihoon48.kim@samsung.com> | 2017-08-24 15:52:29 +0900 |
commit | 423ec5d9abfe07f14b363a522d745cf522ac54b3 (patch) | |
tree | f672615a40ae4c4a87b4615e4111523ac255ebd2 /res/tv | |
parent | 9177e7d78a6a3dc7cc5f3b082e600c5ecd706658 (diff) | |
download | ise-default-423ec5d9abfe07f14b363a522d745cf522ac54b3.tar.gz ise-default-423ec5d9abfe07f14b363a522d745cf522ac54b3.tar.bz2 ise-default-423ec5d9abfe07f14b363a522d745cf522ac54b3.zip |
Modify stt according to TV GUI guide document
Signed-off-by: liuxd <xd123.liu@samsung.com>
Change-Id: I17513a2d3496f99fc6f7ebb59e32147c969a6673
Diffstat (limited to 'res/tv')
-rw-r--r-- | res/tv/edje/w-input-stt.edc | 126 |
1 files changed, 90 insertions, 36 deletions
diff --git a/res/tv/edje/w-input-stt.edc b/res/tv/edje/w-input-stt.edc index 54bbccf..f1b3558 100644 --- a/res/tv/edje/w-input-stt.edc +++ b/res/tv/edje/w-input-stt.edc @@ -49,6 +49,8 @@ collections image, "./text_downdrop_press.#.png" COMP; image, "./input_ic_voice_mic.png" COMP; + image, "./btn_keypad_voice_normal.png" COMP; + image, "./btn_keypad_voice_focused.png" COMP; image, "./w_sip_mask_bg.png" COMP; image, "./tw_bottom_btn_bg.png" COMP; @@ -459,9 +461,11 @@ collections { name, "bg"; type, RECT; - scale, 1; description { + fixed:1 1; + min, 1920 502; + max, 1920 502; state, "default" 0.0; rel1 { @@ -549,20 +553,18 @@ collections { name, "background"; type, IMAGE; - scale, 1; description { state, "default" 0.0; - min, 360 100; - max, 360 100; + fixed: 1 1; rel1 { - relative, 0 0; + relative, 240/1920 62/502; to, "bg"; } rel2 { - relative, 1 1; + relative, 1680/1920 1; to, "bg"; } color: 128 128 128 128; @@ -590,7 +592,7 @@ collections state, "default" 0.0; rel1 { - relative, 0.13 0.3; + relative, 0.32 0.13; to, "background"; } rel2 @@ -605,7 +607,7 @@ collections state, "hide" 0.0; rel1 { - relative, 0.13 0.3; + relative, 0.32 0.13; to, "background"; } rel2 @@ -648,56 +650,100 @@ collections { name, "MIC_ICON"; type, IMAGE; - scale, 1; description { state, "default" 0.0; - min, 50 50; - max, 50 50; + min, 240 240; + max, 240 240; rel1 { - relative, 155/360 26/100; + relative, 600/1440 200/440; to, "background"; } rel2 { - relative, 205/360 76/100; + relative, 840/1440 440/440; to, "background"; } - image.normal, "./input_ic_voice_mic.png"; + image.normal, "./btn_keypad_voice_focused.png"; + } + description + { + state, "idle" 0.0; + inherit, "default" 0.0; + image.normal, "./btn_keypad_voice_normal.png"; } description { state, "recording" 0.0; inherit, "default" 0.0; - visible, 0; } description { state, "processing" 0.0; inherit, "default" 0.0; - visible, 0; } description { state, "message" 0.0; inherit, "default" 0.0; - rel1 + } + } + + part + { + name, "switch.text"; + type, TEXTBLOCK; + description + { + state, "default" 0.0; + rel1 + { + relative, 600/1440 400/440; + to, "background"; + } + rel2 + { + relative, 840/1440 440/440; + to, "background"; + } + text + { + text: "On"; + fit: 1 1; + style, "textblock_style"; + } + color, 51 204 255 255; + } + description + { + state, "idle" 0.0; + inherit, "default" 0.0; + text { - relative, 155/360 41/100; - to, "background"; + text: "Off"; } - rel2 + } + description + { + state, "message" 0.0; + inherit, "default" 0.0; + text { - relative, 205/360 91/100; - to, "background"; + text: "On"; + } + } + description + { + state, "processing" 0.0; + inherit, "default" 0.0; + text + { + text: "On"; } - visible, 1; } } - - //Part for mic button part { @@ -708,16 +754,16 @@ collections { state, "default" 0.0; visible, 1; - min, 290 100; - max, 290 100; + min, 240 240; + max, 240 240; rel1 { - relative, 35/360 0.0; + relative, 600/1440 200/440; to, "background"; } rel2 { - relative, 325/360 1.0; + relative, 840/1440 440/440; to, "background"; } } @@ -726,24 +772,29 @@ collections { name, "PROGRESS_BAR"; type, SWALLOW; - scale, 1; description { state, "default" 0.0; - min, 50 50; - max, 50 50; + min, 800 150; + max, 800 150; visible, 0; + align: 0.5 0.3; rel1 { - relative, 155/360 27/100; + relative, 0.0 0.0; to, "background"; } rel2 { - relative, 205/360 77/100; + relative, 1.0 1.0; to, "background"; } } + description + { + state, "idle" 0.0; + inherit, "default" 0.0; + } description { state, "message" 0.0; @@ -845,7 +896,7 @@ collections { name, "initial_view"; signal, "mouse,clicked,1"; - source, "background"; + source, "MIC_ICON"; in, 0 0.3; after, "emit_signal1"; } @@ -873,6 +924,7 @@ collections action, STATE_SET "processing" 0.0; target, "PROGRESS_BAR"; target, "MIC_ICON"; + target, "switch.text"; transition, DECELERATE 0.3; } @@ -881,9 +933,10 @@ collections name, "idle"; signal, "elm,state,init"; source, "elm"; - action, STATE_SET "default" 0.0; + action, STATE_SET "idle" 0.0; target, "PROGRESS_BAR"; target, "MIC_ICON"; + target, "switch.text"; transition, DECELERATE 0.3; } program @@ -894,6 +947,7 @@ collections action, STATE_SET "message" 0.0; target, "PROGRESS_BAR"; target, "MIC_ICON"; + target, "switch.text"; } program |