Modify the screen UI for stt mode and refactoring code
[platform/core/uifw/inputdelegator.git] / res / wearable / edje / w-input-stt.edc
index 13168ba..89fdbf1 100755 (executable)
@@ -1,7 +1,7 @@
 #include "w-input-stt-button.edc"
 
 #define VOICE_CANDIDATE_AREA_HEIGHT 56
-#define BUTTON_TEXT_SIZE_INC 85
+#define BUTTON_TEXT_SIZE_INC 80
 
 collections
 {
@@ -36,11 +36,6 @@ collections
                   * web: http://slp-info.sec.samsung.net/gerrit/plugins/gitiles/magnolia/framework/system/libsvi
                   */
           }
-          plugin {
-                 name: "haptic_tap";
-                 source: "feedback";
-                 param: "FEEDBACK_TYPE_VIBRATION FEEDBACK_PATTERN_TAP";
-          }
        }
 
        images {
@@ -50,8 +45,6 @@ collections
                image, "./icon/B13_mic_Que.png" COMP;
                image, "./icon/B13_mic_Que_01.png" COMP;
                image, "./icon/B13_mic_procecessing_bg.png" COMP;
-               image, "./text_downdrop.#.png" COMP;
-               image, "./text_downdrop_press.#.png" COMP;
 
                image, "./input_ic_voice_mic.png" COMP;
                image, "./w_sip_mask_bg.png" COMP;
@@ -64,6 +57,7 @@ collections
                image, "./b_stt_icon_btn.png" COMP;
                image, "./b_stt_confirm_icon.png" COMP;
                image, "./b_stt_send_icon.png" COMP;
+               image, "./wi_stt_icon_error.png" COMP;
        }
 
        color_classes 
@@ -387,7 +381,7 @@ collections
           {
              name: "AT0114";
 #            color: 0 0 0 100;
-          color: 128 128 128 100;
+              color: 128 128 128 100;
           }
           color_class 
           {
@@ -469,14 +463,23 @@ collections
                        tag,  "b" "+ font=Tizen:style=Bold";
                        tag,  "tab" "\t";
                }
+               style { name: "button_general_text_normal";
+                       base: "font=Tizen:style=Regular font_size="BUTTON_TEXT_SIZE_INC" align=center color=#FFFFFF ellipsis=0.0 wrap=mixed";
+               }
                style { name: "button_general_text_dim";
                        base: "font=Tizen:style=Regular font_size="BUTTON_TEXT_SIZE_INC" align=center color=#FFFFFF ellipsis=0.0 wrap=mixed";
                }
                style { name: "button_general_text_press";
                        base: "font=Tizen:style=Regular font_size="BUTTON_TEXT_SIZE_INC" align=center color=#888888 ellipsis=0.0 wrap=mixed";
                }
-               style { name: "button_general_text_normal";
-                       base: "font=Tizen:style=Regular font_size="BUTTON_TEXT_SIZE_INC" align=center color=#FFFFFF ellipsis=0.0 wrap=mixed";
+               style { name: "button_send_text_normal";
+                       base: "font=Tizen:style=Regular font_size="BUTTON_TEXT_SIZE_INC" align=center color=#FFFFFF color_class=AT0117 ellipsis=0.0 wrap=mixed";
+               }
+               style { name: "button_cue_text_normal";
+                       base: "font=Tizen:style=Regular font_size="BUTTON_TEXT_SIZE_INC" align=center color=#FFFFFF color_class=AT032 ellipsis=0.0 wrap=mixed";
+               }
+               style { name: "button_bottom_text_normal";
+                       base: "font=Tizen:style=Regular font_size=26 align=center color=#FFFFFF color_class=AT0118";
                }
        }
 
@@ -507,6 +510,21 @@ collections
                        }
                        part
                        {
+                               name, "access_bg";
+                               type, SWALLOW;
+                               scale, 1;
+                               description
+                               {
+                                       state, "default" 0.0;
+                                       visible, 1;
+                                       min, 360 360;
+                                       max, 360 360;
+                                       rel1.to, "bg";
+                                       rel2.to, "bg";
+                               }
+                       }
+                       part
+                       {
                                name, "top_block";
                                type, SPACER;
                                scale, 1;
@@ -526,6 +544,23 @@ collections
                                                to, "bg";
                                        }
                                }
+                               description
+                               {
+                                       state, "hide" 0.0;
+                                       min, 360 360;
+                                       align, 0.5 0;
+                                       rel1
+                                       {
+                                               relative, 0.0 0.0;
+                                               to, "bg";
+                                       }
+                                       rel2
+                                       {
+                                               relative, 1.0 0.0;
+                                               to, "bg";
+                                       }
+                               }
+
                        }
 
                        part
@@ -536,20 +571,18 @@ collections
                                {
                                        state, "default" 0.0;
                                        align, 0.5 1;
-                                       min, 282 (360-103);
-                                       max, 282 (360-103);
+                                       min, 282 360;
+                                       max, 282 360;
 
                                        rel1
                                        {
                                                relative, 39/360 1;
-                                               to, "top_block";
-                                               offset, 0 -1;
+                                               to, "bg";
                                        }
                                        rel2
                                        {
                                                relative, 321/360 1;
-                                               to, "top_block";
-                                               offset, 0 -1;
+                                               to, "bg";
                                        }
                                }
                        }
@@ -583,11 +616,11 @@ collections
                                description
                                {
                                        state, "default" 0.0;
-                                       min, 360 100;
-                                       max, 360 100;
+                                       min, 360 78;
+                                       max, 360 78;
                                        rel1
                                        {
-                                               relative, 0 260/360;
+                                               relative, 0 (360-78)/360;
                                                to, "bg";
                                        }
                                        rel2
@@ -600,6 +633,25 @@ collections
                                }
                                description
                                {
+                                       state, "hide" 0.0;
+                                       min, 360 78;
+                                       max, 360 78;
+                                       rel1
+                                       {
+                                               relative, 0 1;
+                                               to, "bg";
+                                       }
+                                       rel2
+                                       {
+                                               relative, 1 (360+78)/360;
+                                               to, "bg";
+                                       }
+                                       image.normal, "./tw_bottom_btn_bg.png";
+                                       color: 128 128 128 128;
+                               }
+
+                               description
+                               {
                                        state, "pressed" 0.0;
                                        inherit, "default" 0.0;
                                        color: 128 128 128 128;
@@ -658,7 +710,6 @@ collections
                                }
 
                        }
-
                        part
                        {
                                name, "EFFECT_BG";
@@ -686,123 +737,286 @@ collections
                                }
                        }
 
-
+                       //Part for mic button
                        part
                        {
-                               name, "MIC_ICON";
-                               type, IMAGE;
+                               name, "BOTTOM_BUTTON";
+                               type, SWALLOW;
+                               scale, 1;
+                               description
+                               {
+                                       state, "default" 0.0;
+                                       visible, 1;
+                                       min, 290 78;
+                                       max, 290 78;
+                                       rel1
+                                       {
+                                               relative, 35/360 0.0;
+                                               to, "background";
+                                       }
+                                       rel2
+                                       {
+                                               relative, 325/360 1.0;
+                                               to, "background";
+                                       }
+                               }
+                       }
+                       part
+                       {
+                               name, "PROGRESS_BAR";
+                               type, SWALLOW;
                                scale, 1;
                                description
                                {
                                        state, "default" 0.0;
                                        min, 50 50;
                                        max, 50 50;
+                                       visible, 0;
                                        rel1
                                        {
-                                               relative, 155/360 26/100;
+                                               relative, 155/360 27/100;
                                                to, "background";
                                        }
                                        rel2
                                        {
-                                               relative, 205/360 76/100;
+                                               relative, 205/360 77/100;
                                                to, "background";
                                        }
-                                       image.normal, "./input_ic_voice_mic.png";
                                }
                                description
                                {
-                                       state, "recording" 0.0;
+                                       state, "message" 0.0;
                                        inherit, "default" 0.0;
-                                       visible, 0;
                                }
                                description
                                {
                                        state, "processing" 0.0;
                                        inherit, "default" 0.0;
-                                       visible, 0;
+                                       visible, 1;
+                               }
                                }
+
+                       part
+                       {
+                               name, "cue_text_block";
+                               type, SPACER;
                                description
                                {
-                                       state, "message" 0.0;
-                                       inherit, "default" 0.0;
+                                       state, "default" 0.0;
+                                       align, 0.5 0;
                                        rel1
                                        {
-                                               relative, 155/360 41/100;
-                                               to, "background";
+                                               relative, 30/360 158/360;
+                                               to, "bg";
                                        }
                                        rel2
                                        {
-                                               relative, 205/360 91/100;
-                                               to, "background";
+                                               relative, (360-30)/360 (158+43)/360;
+                                               to, "bg";
+                                       }
+                               }
+                       }
+
+                       part
+                       {
+                               name, "elm.text.cue";
+                               type, TEXTBLOCK;
+                               mouse_events, 0;
+                               scale, 1;
+                               description
+                               {
+                                       state, "default" 0.0;
+                                       visible, 0;
+                                       rel1.to, "cue_text_block";
+                                       rel2.to, "cue_text_block";
+                                       text
+                                       {
+                                               fit: 1 1;
+                                               style, "button_cue_text_normal";
                                        }
+                               }
+                               description
+                               {
+                                       state, "show" 0.0;
                                        visible, 1;
+                                       align, 0.5 0.6;
+                                       rel1.to, "cue_text_block";
+                                       rel2.to, "cue_text_block";
+                                       text
+                                       {
+                                               fit: 1 1;
+                                               style, "button_cue_text_normal";
+                                       }
+                               }
+                       }
+
+                       part
+                       {
+                               name, "guide_text_block_left_padding";
+                               type, SPACER;
+                               description
+                               {
+                                       state, "default" 0.0;
+                                       min, (80+28+8) 0;
+                                       max, (80+28+8) -1;
+                                       fixed, 1 0;
+                                       align, 0.0 0.0;
+                                       rel1
+                                       {
+                                               relative, 0 (360-70)/360;
+                                               to, "bg";
+                                       }
+                                       rel2
+                                       {
+                                               relative, 0 (360-33)/360;
+                                               to, "bg";
                                }
                        }
 
+                       }
+                       part
+                       {
+                               name, "guide_text_block_right_padding";
+                               type, SPACER;
+                               description
+                               {
+                                       state, "default" 0.0;
+                                       min, 80 0;
+                                       max, 80 -1;
+                                       fixed, 1 0;
+                                       align, 1.0 0.0;
+                                       rel1
+                                       {
+                                               relative, 1 (360-70)/360;
+                                               to, "bg";
+                                       }
+                                       rel2
+                                       {
+                                               relative, 1 (360-33)/360;
+                                               to, "bg";
+                                       }
+                               }
 
+                       }
 
-                       //Part for mic button
                        part
                        {
-                               name, "MIC";
-                               type, SWALLOW;
-                               scale, 1;
+                               name, "guide_text_block";
+                               type, SPACER;
                                description
                                {
                                        state, "default" 0.0;
-                                       visible, 1;
-                                       min, 290 100;
-                                       max, 290 100;
+                                       align, 0.5 0;
                                        rel1
                                        {
-                                               relative, 35/360 0.0;
-                                               to, "background";
+                                               relative, 1.0 0.0;
+                                               to, "guide_text_block_left_padding";
                                        }
                                        rel2
                                        {
-                                               relative, 325/360 1.0;
-                                               to, "background";
+                                               relative, 0.0 1.0;
+                                               to, "guide_text_block_right_padding";
                                        }
                                }
+
                        }
                        part
                        {
-                               name, "PROGRESS_BAR";
-                               type, SWALLOW;
+                               name, "elm.text";
+                               type, TEXTBLOCK;
+                               mouse_events, 0;
                                scale, 1;
                                description
                                {
                                        state, "default" 0.0;
-                                       min, 50 50;
-                                       max, 50 50;
+                                       min, 0 37;
+                                       max, -1 37;
+                                       fixed, 0 1;
+                                       align, 0.5 0.5;
+                                       text {
+                                               min, 0 1;
+                                               max, 1 1;
+                                               ellipsis, -1.0;
+                                               fade_ellipsis, 1.0;
+                                               style, "button_bottom_text_normal";
+                                       }
                                        visible, 0;
                                        rel1
                                        {
-                                               relative, 155/360 27/100;
-                                               to, "background";
+                                               relative, 0.0 0.0;
+                                               to, "guide_text_block";
                                        }
                                        rel2
                                        {
-                                               relative, 205/360 77/100;
-                                               to, "background";
+                                               relative, 1.0 1.0;
+                                               to, "guide_text_block";
                                        }
                                }
                                description
                                {
-                                       state, "message" 0.0;
-                                       inherit, "default" 0.0;
+                                       state, "show" 0.0;
+                                       inherit, "default";
+                                       visible, 1;
+                               }
                                }
+                       part
+                       {
+                               name, "guide_text_block_icon_padding";
+                               type, SPACER;
                                description
                                {
-                                       state, "processing" 0.0;
-                                       inherit, "default" 0.0;
-                                       visible, 1;
+                                       state, "default" 0.0;
+                                       min, 8 0;
+                                       max, 8 -1;
+                                       fixed, 1 0;
+                                       align, 1.0 0.0;
+                                       rel1
+                                       {
+                                               relative, 0 0;
+                                               to, "elm.text";
+                                       }
+                                       rel2
+                                       {
+                                               relative, 0 1;
+                                               to, "elm.text";
                                }
                        }
 
+                       }
                        part
                        {
-                               name, "guide_text_block";
+                               name, "error_icon";
+                               type, IMAGE;
+                               description
+                               {
+                                       state, "default" 0.0;
+                                       min, 28 37;
+                                       max, 28 37;
+                                       align, 1.0 0.5;
+                                       rel1
+                                       {
+                                               relative, 0.0 0.0;
+                                               to, "guide_text_block_icon_padding";
+                                       }
+                                       rel2
+                                       {
+                                               relative, 0.0 1.0;
+                                               to, "guide_text_block_icon_padding";
+                                       }
+                                       image.normal, "./wi_stt_icon_error.png";
+                                       color_class, "AO015";
+                                       visible, 0;
+                               }
+                               description
+                               {
+                                       state, "show" 0.0;
+                                       inherit, "default";
+                                       visible, 1;
+                               }
+                       }
+                       part
+                       {
+                               name, "send_text_block";
                                type, SPACER;
                                description
                                {
@@ -810,35 +1024,35 @@ collections
                                        align, 0.5 0;
                                        rel1
                                        {
-                                               relative, 39/360 140/360;
-                                               to, "bg";
+                                               relative, 105/360 5/78;
+                                               to, "background";
                                        }
                                        rel2
                                        {
-                                               relative, (360-39)/360 (140+42)/360;
-                                               to, "bg";
+                                               relative, (360-105)/360 (78-38)/78;
+                                               to, "background";
                                        }
                                }
                                description
                                {
-                                       state, "bottom" 0.0;
+                                       state, "expand" 0.0;
                                        align, 0.5 0;
                                        rel1
                                        {
-                                               relative, 74/360 (360-91)/360;
-                                               to, "bg";
+                                               relative, 84/360 18/78;
+                                               to, "background";
                                        }
                                        rel2
                                        {
-                                               relative, (360-74)/360 (360-57)/360;
-                                               to, "bg";
-                                       }
+                                               relative, (360-82)/360 (78-23)/78;
+                                               to, "background";
                                }
                        }
 
+                       }
                        part
                        {
-                               name, "elm.text";
+                               name, "elm.text.send";
                                type, TEXTBLOCK;
                                mouse_events, 0;
                                scale, 1;
@@ -846,28 +1060,17 @@ collections
                                {
                                        state, "default" 0.0;
                                        visible, 1;
-                                       align, 0.5 0.6;
-                                       rel1.to, "guide_text_block";
-                                       rel2.to, "guide_text_block";
-                                       text
-                                       {
-                                               fit: 1 1;
-                                               style, "textblock_style";
-                                       }
-                                       color, 120 120 120 120;
-                               }
-                               description
-                               {
-                                       state, "bottom" 0.0;
-                                       inherit, "default" 0.0;
+                                       align, 0.5 0.5;
+                                       rel1.to, "send_text_block";
+                                       rel2.to, "send_text_block";
                                        text
                                        {
                                                fit: 1 1;
-                                               style, "textblock_style_bottom";
+                                               style, "button_send_text_normal";
                                        }
-                                       color, 120 120 120 120;
                                }
                        }
+
                }
 
                programs
@@ -889,60 +1092,73 @@ collections
 
                        program
                        {
-                               name,   "listening";
-                               signal, "elm,state,listening";
+                               name,   "cue_text_show";
+                               signal, "idle,state,cue_text,visible";
                                source, "elm";
-                               action, STATE_SET "recording" 0.0;
-                               target, "MIC_ICON";
+                               action, STATE_SET "show" 0.0;
+                               target, "elm.text.cue";
+                               after: "cue_text_hide";
                        }
 
                        program
                        {
-                               name,   "start_processing";
-                               signal, "elm,state,processing";
+                               name,   "cue_text_hide";
+                               signal, "idle,state,cue_text,hidden";
                                source, "elm";
-                               action, STATE_SET "processing" 0.0;
-                               target, "PROGRESS_BAR";
-                               target, "MIC_ICON";
-                               transition, DECELERATE 0.3;
+                               in, 2.0 0.0;
+                               action, STATE_SET "default" 0.0;
+                               target, "elm.text.cue";
                        }
 
                        program
                        {
-                               name,   "idle";
-                               signal, "elm,state,init";
+                               name,   "text_show";
+                               signal, "idle,state,text,visible";
                                source, "elm";
-                               action, STATE_SET "default" 0.0;
-                               target, "PROGRESS_BAR";
-                               target, "MIC_ICON";
-                               transition, DECELERATE 0.3;
+                               action, STATE_SET "show" 0.0;
+                               target, "elm.text";
+                               target, "error_icon";
+                               after: "text_hide_delayed";
                        }
+
                        program
                        {
-                               name, "idle_message";
-                               signal, "elm,state,init_message";
+                               name,   "text_hide";
+                               signal, "idle,state,text,hidden";
                                source, "elm";
-                               action, STATE_SET "message" 0.0;
-                               target, "PROGRESS_BAR";
-                               target, "MIC_ICON";
+                               action, STATE_SET "default" 0.0;
+                               target, "elm.text";
+                               target, "error_icon";
                        }
 
                        program
                        {
-                               name,   "text_show";
-                               signal, "idle,state,text,visible";
+                               name,   "text_hide_delayed";
+                               signal, "idle,state,text,hidden,delayed";
                                source, "elm";
-                               action, STATE_SET "expand" 0.0;
+                               in, 2.0 0.0;
+                               action, STATE_SET "default" 0.0;
                                target, "elm.text";
+                               target, "error_icon";
                        }
 
                        program
                        {
-                               name,   "text_hide";
-                               signal, "idle,state,text,hidden";
+                               name,   "contract_send_text";
+                               signal, "idle,state,send,text,contract";
                                source, "elm";
                                action, STATE_SET "default" 0.0;
-                               target, "elm.text";
+                               target, "send_text_block";
+
+                       }
+                       program
+                       {
+                               name,   "expand_send_text";
+                               signal, "idle,state,send,text,expand";
+                               source, "elm";
+                               action, STATE_SET "expand" 0.0;
+                               target, "send_text_block";
+
                        }
                        program
                        {
@@ -962,24 +1178,55 @@ collections
                                target, "EFFECT_BG";
                        }
 
+                       // Button
                        program
                        {
-                               name,   "guide_text_up";
-                               signal, "idle,state,guide_text,up";
+                               name,   "bottom_button_show";
+                               signal, "idle,state,show,bottom_button";
                                source, "elm";
                                action, STATE_SET "default" 0.0;
-                               target, "guide_text_block";
+                               target, "background";
+                               transition, DECELERATE 0.2;
                        }
                        program
                        {
-                               name,   "guide_text_bottom";
-                               signal, "idle,state,guide_text,bottom";
+                               name,   "bottom_button_show_delayed";
+                               signal, "idle,state,show,bottom_button,delayed";
                                source, "elm";
-                               action, STATE_SET "bottom" 0.0;
-                               target, "guide_text_block";
+                               in, 2.0 0.0;
+                               action, STATE_SET "default" 0.0;
+                               target, "background";
+                               transition, DECELERATE 0.2;
                        }
 
-
+                       program
+                       {
+                               name,   "bottom_button_hide";
+                               signal, "idle,state,hide,bottom_button";
+                               source, "elm";
+                               action, STATE_SET "hide" 0.0;
+                               target, "background";
+                               transition, DECELERATE 0.2;
+                       }
+                       // EFFECT Area
+                       program
+                       {
+                               name,   "bottom_effect_show";
+                               signal, "idle,state,show,effect";
+                               source, "elm";
+                               action, STATE_SET "default" 0.0;
+                               target, "EFFECT_BG_AREA";
+                               transition, DECELERATE 0.2;
+                       }
+                       program
+                       {
+                               name,   "bottom_effect_hide";
+                               signal, "idle,state,hide,effect";
+                               source, "elm";
+                               action, STATE_SET "hide" 0.0;
+                               target, "EFFECT_BG_AREA";
+                               transition, DECELERATE 0.2;
+                       }
                }
        }
 
@@ -1117,7 +1364,15 @@ collections
                          type: SWALLOW;
                          description { state: "default" 0.0;
                                 min: 282 39;
-                                color, 120 120 120 120;
+                                align: 0.5 1;
+                                rel1
+                                {
+                                        relative, 0.0 1.0;
+                                }
+                                rel2
+                                {
+                                        relative, 1.0 1.0;
+                                }
                          }
                   }
                }
@@ -1158,7 +1413,7 @@ collections
                                                relative, 1.0 1.0;
                                        }
                                        visible: 1;
-                                       color, 120 120 120 120;
+                                       color: 0 0 0 255;
                                }
                        }
                        part { name: "padding_top";
@@ -1169,7 +1424,7 @@ collections
                                        align: 0.0 0.0;
                                        rel1.relative: 0.0 0.0;
                                        rel2.relative: 1.0 0.0;
-                                       min: 0 20;
+                                       min: 0 24;
                                        fixed: 1 1;
                                }
                        }
@@ -1215,205 +1470,6 @@ collections
 
 
 
-#define PROGRESSBAR_ACTIVITY_SMALL_SIZE_INC 50
-       group
-       {
-               name: "elm/progressbar/horizontal/voice_input/process/small";
-               images {
-                       image: "style/tw_loading_small_00.png" COMP;
-                       image: "style/tw_loading_small_01.png" COMP;
-                       image: "style/tw_loading_small_02.png" COMP;
-                       image: "style/tw_loading_small_03.png" COMP;
-                       image: "style/tw_loading_small_04.png" COMP;
-                       image: "style/tw_loading_small_05.png" COMP;
-                       image: "style/tw_loading_small_06.png" COMP;
-                       image: "style/tw_loading_small_07.png" COMP;
-                       image: "style/tw_loading_small_08.png" COMP;
-                       image: "style/tw_loading_small_09.png" COMP;
-                       image: "style/tw_loading_small_10.png" COMP;
-                       image: "style/tw_loading_small_11.png" COMP;
-                       image: "style/tw_loading_small_12.png" COMP;
-                       image: "style/tw_loading_small_13.png" COMP;
-                       image: "style/tw_loading_small_14.png" COMP;
-                       image: "style/tw_loading_small_15.png" COMP;
-                       image: "style/tw_loading_small_16.png" COMP;
-                       image: "style/tw_loading_small_17.png" COMP;
-                       image: "style/tw_loading_small_18.png" COMP;
-                       image: "style/tw_loading_small_19.png" COMP;
-                       image: "style/tw_loading_small_20.png" COMP;
-                       image: "style/tw_loading_small_21.png" COMP;
-                       image: "style/tw_loading_small_22.png" COMP;
-                       image: "style/tw_loading_small_23.png" COMP;
-                       image: "style/tw_loading_small_24.png" COMP;
-                       image: "style/tw_loading_small_25.png" COMP;
-                       image: "style/tw_loading_small_26.png" COMP;
-                       image: "style/tw_loading_small_27.png" COMP;
-                       image: "style/tw_loading_small_28.png" COMP;
-                       image: "style/tw_loading_small_29.png" COMP;
-                       image: "style/tw_loading_small_30.png" COMP;
-                       image: "style/tw_loading_small_31.png" COMP;
-                       image: "style/tw_loading_small_32.png" COMP;
-                       image: "style/tw_loading_small_33.png" COMP;
-                       image: "style/tw_loading_small_34.png" COMP;
-                       image: "style/tw_loading_small_35.png" COMP;
-                       image: "style/tw_loading_small_36.png" COMP;
-                       image: "style/tw_loading_small_37.png" COMP;
-                       image: "style/tw_loading_small_38.png" COMP;
-                       image: "style/tw_loading_small_39.png" COMP;
-                       image: "style/tw_loading_small_40.png" COMP;
-                       image: "style/tw_loading_small_41.png" COMP;
-                       image: "style/tw_loading_small_42.png" COMP;
-                       image: "style/tw_loading_small_43.png" COMP;
-                       image: "style/tw_loading_small_44.png" COMP;
-                       image: "style/tw_loading_small_45.png" COMP;
-                       image: "style/tw_loading_small_46.png" COMP;
-                       image: "style/tw_loading_small_47.png" COMP;
-                       image: "style/tw_loading_small_48.png" COMP;
-                       image: "style/tw_loading_small_49.png" COMP;
-                       image: "style/tw_loading_small_50.png" COMP;
-                       image: "style/tw_loading_small_51.png" COMP;
-                       image: "style/tw_loading_small_52.png" COMP;
-                       image: "style/tw_loading_small_53.png" COMP;
-                       image: "style/tw_loading_small_54.png" COMP;
-                       image: "style/tw_loading_small_55.png" COMP;
-                       image: "style/tw_loading_small_56.png" COMP;
-                       image: "style/tw_loading_small_57.png" COMP;
-                       image: "style/tw_loading_small_58.png" COMP;
-                       image: "style/tw_loading_small_59.png" COMP;
-                       image: "style/tw_loading_small_60.png" COMP;
-                       image: "style/tw_loading_small_61.png" COMP;
-                       image: "style/tw_loading_small_62.png" COMP;
-                       image: "style/tw_loading_small_63.png" COMP;
-                       image: "style/tw_loading_small_64.png" COMP;
-               }
-               parts {
-                       part {
-                               name: "access";
-                               type: RECT;
-                               description
-                               {
-                                       state: "default" 0.0;
-                                       fixed: 1 1;
-                                       color: 0 0 0 0;
-                               }
-                       }
-                       part {
-                               name: "elm.background.progressbar";
-                               mouse_events: 0;
-                               scale: 1;
-                               type: RECT;
-                               description {
-                                       state: "default" 0.0;
-                               }
-                       }
-                       part {
-                               name: "bar";
-                               mouse_events: 0;
-                               scale: 1;
-                               clip_to: "elm.background.progressbar";
-                               description {
-                                       state: "default" 0.0;
-                                       min: PROGRESSBAR_ACTIVITY_SMALL_SIZE_INC PROGRESSBAR_ACTIVITY_SMALL_SIZE_INC;
-                                       max: PROGRESSBAR_ACTIVITY_SMALL_SIZE_INC PROGRESSBAR_ACTIVITY_SMALL_SIZE_INC;
-                                       fixed, 1 1;
-                                       aspect: 1.0 1.0;
-                                       aspect_preference: BOTH;
-                                       image.normal: "style/tw_loading_small_00.png";
-                                       image.tween: "style/tw_loading_small_01.png";
-                                       image.tween: "style/tw_loading_small_02.png";
-                                       image.tween: "style/tw_loading_small_03.png";
-                                       image.tween: "style/tw_loading_small_04.png";
-                                       image.tween: "style/tw_loading_small_05.png";
-                                       image.tween: "style/tw_loading_small_06.png";
-                                       image.tween: "style/tw_loading_small_07.png";
-                                       image.tween: "style/tw_loading_small_08.png";
-                                       image.tween: "style/tw_loading_small_09.png";
-                                       image.tween: "style/tw_loading_small_10.png";
-                                       image.tween: "style/tw_loading_small_11.png";
-                                       image.tween: "style/tw_loading_small_12.png";
-                                       image.tween: "style/tw_loading_small_13.png";
-                                       image.tween: "style/tw_loading_small_14.png";
-                                       image.tween: "style/tw_loading_small_15.png";
-                                       image.tween: "style/tw_loading_small_16.png";
-                                       image.tween: "style/tw_loading_small_17.png";
-                                       image.tween: "style/tw_loading_small_18.png";
-                                       image.tween: "style/tw_loading_small_19.png";
-                                       image.tween: "style/tw_loading_small_20.png";
-                                       image.tween: "style/tw_loading_small_21.png";
-                                       image.tween: "style/tw_loading_small_22.png";
-                                       image.tween: "style/tw_loading_small_23.png";
-                                       image.tween: "style/tw_loading_small_24.png";
-                                       image.tween: "style/tw_loading_small_25.png";
-                                       image.tween: "style/tw_loading_small_26.png";
-                                       image.tween: "style/tw_loading_small_27.png";
-                                       image.tween: "style/tw_loading_small_28.png";
-                                       image.tween: "style/tw_loading_small_29.png";
-                                       image.tween: "style/tw_loading_small_30.png";
-                                       image.tween: "style/tw_loading_small_31.png";
-                                       image.tween: "style/tw_loading_small_32.png";
-                                       image.tween: "style/tw_loading_small_33.png";
-                                       image.tween: "style/tw_loading_small_34.png";
-                                       image.tween: "style/tw_loading_small_35.png";
-                                       image.tween: "style/tw_loading_small_36.png";
-                                       image.tween: "style/tw_loading_small_37.png";
-                                       image.tween: "style/tw_loading_small_38.png";
-                                       image.tween: "style/tw_loading_small_39.png";
-                                       image.tween: "style/tw_loading_small_40.png";
-                                       image.tween: "style/tw_loading_small_41.png";
-                                       image.tween: "style/tw_loading_small_42.png";
-                                       image.tween: "style/tw_loading_small_43.png";
-                                       image.tween: "style/tw_loading_small_44.png";
-                                       image.tween: "style/tw_loading_small_45.png";
-                                       image.tween: "style/tw_loading_small_46.png";
-                                       image.tween: "style/tw_loading_small_47.png";
-                                       image.tween: "style/tw_loading_small_48.png";
-                                       image.tween: "style/tw_loading_small_48.png";
-                                       image.tween: "style/tw_loading_small_49.png";
-                                       image.tween: "style/tw_loading_small_50.png";
-                                       image.tween: "style/tw_loading_small_51.png";
-                                       image.tween: "style/tw_loading_small_52.png";
-                                       image.tween: "style/tw_loading_small_53.png";
-                                       image.tween: "style/tw_loading_small_54.png";
-                                       image.tween: "style/tw_loading_small_55.png";
-                                       image.tween: "style/tw_loading_small_56.png";
-                                       image.tween: "style/tw_loading_small_57.png";
-                                       image.tween: "style/tw_loading_small_58.png";
-                                       image.tween: "style/tw_loading_small_59.png";
-                                       image.tween: "style/tw_loading_small_60.png";
-                                       image.tween: "style/tw_loading_small_61.png";
-                                       image.tween: "style/tw_loading_small_62.png";
-                                       image.tween: "style/tw_loading_small_63.png";
-                                       image.tween: "style/tw_loading_small_64.png";
-                                       color: 128 128 128 128;
-                               }
-                       }
-               }
-               programs {
-                       program {
-                               name: "start_pulse";
-                               signal: "elm,state,pulse,start";
-                               source: "elm";
-                               action: STATE_SET "default" 0.0;
-                               target: "bar";
-                               transition: LINEAR 1.8;
-                               after: "start_pulse";
-                       }
-                       program {
-                               name: "stop_pulse";
-                               signal: "elm,state,pulse,stop";
-                               source: "elm";
-                               action: ACTION_STOP;
-                               target: "start_pulse";
-                               after: "init_pulse";
-                       }
-                       program { name: "init_pulse";
-                               action: STATE_SET "default" 0.0;
-                               target: "bar";
-                       }
-               }
-       }
-
-
 #define BUTTON_PADDING_SIZE_INC                            20 0
 #define BUTTON_HEIGHT_INC                                  122
 #define BUTTON_ICON_SIZE_INC                               60 60
@@ -1591,7 +1647,8 @@ collections
                                get_state(PART:"bg", st, 30, vl);
                                if (strcmp(st, "disabled")) {
                                        set_state(PART:"bg", "pressed", 0.0);
-                                       set_state(PART:"elm.text", "pressed", 0.0);
+                                       //set_state(PART:"bg_image", "pressed", 0.0);
+                                       set_state(PART:"elm.swallow.content.clip", "pressed", 0.0);
                                        emit("elm,action,press", "");
                                }
                        }
@@ -1613,7 +1670,8 @@ collections
                                get_state(PART:"bg", st, 30, vl);
                                if (strcmp(st, "disabled")) {
                                        set_state(PART:"bg", "default", 0.0);
-                                       set_state(PART:"elm.text", "default", 0.0);
+                                       //set_state(PART:"bg_image", "default", 0.0);
+                                       set_state(PART:"elm.swallow.content.clip", "default", 0.0);
                                        emit("elm,action,unpress", "");
                                }
                        }
@@ -1681,7 +1739,7 @@ collections
                program { name: "icon_hide";
                        signal: "elm,state,icon,hidden";
                        source: "elm";
-                       action: STATE_SET "default" 0.0;
+                       action: STATE_SET "visible" 0.0;
                        target: "elm.swallow.content";
                        target: "icon_rect";
                }
@@ -1944,45 +2002,6 @@ collections
                }
        }
 
-       group { name: "elm/button/base/ime_button_stt_confirm";
-               inherit: "elm/button/base/ime_button";
-               parts {
-                       part { name: "bg";
-                               type: IMAGE;
-                               scale: 1;
-                               description { state: "default" 0.0;
-                                       min: 0 0;
-                                       color_class: "AO015L2";
-                                       visible: 0;
-                                       image.normal: "./b_stt_icon_btn.png";
-                               }
-                               description { state: "pressed" 0.0;
-                                       inherit: "default" 0.0;
-                                       color_class: "AO015L2P";
-                               }
-                               description { state: "disabled" 0.0;
-                                       inherit: "default" 0.0;
-                                       color_class: "AO015L2D";
-                               }
-                       }
-                       part { name: "elm.swallow.content.clip";
-                               type: RECT;
-                               scale: 1;
-                               description { state: "default" 0.0;
-                                       color_class: "AO015L2";
-                               }
-                               description { state: "pressed" 0.0;
-                                       inherit: "default" 0.0;
-                                       color_class: "AO015L2P";
-                               }
-                               description { state: "disabled" 0.0;
-                                       inherit: "default" 0.0;
-                                       color_class: "AO015L2D";
-                               }
-                       }
-               }
-       }
-
        group { name: "elm/button/base/touch_area";
                inherit: "elm/button/base/default";
                parts {
@@ -2080,7 +2099,7 @@ collections
                                                to: "padding_right_bottom";
                                        }
                                        text {
-                                               min: 1 0;
+                                               max: 1 0;
                                                style: "button_general_text_normal";
                                        }
                                }
@@ -2523,14 +2542,42 @@ group { name: "elm_naviframe_item_basic_customized";
                                rel2 {relative: 1.0 1.0; to: "title_bg"; }
                        }
                }
+               part { name: "left_padding_content";
+                       type: RECT;
+                       scale: 1;
+                       description { state: "default" 0.0;
+                               min: 33 0;
+                               max: 33 -1;
+                               fixed: 1 0;
+                               align: 0.0 0.5;
+                               rel1 { relative: 0.0 0.0; to: "base"; }
+                               rel2 { relative: 0.0 1.0; to: "base"; }
+                               visible: 0;
+                               color: 255 0 0 100;
+                       }
+               }
+               part { name: "right_padding_content";
+                       type: RECT;
+                       scale: 1;
+                       description { state: "default" 0.0;
+                               min: 33 0;
+                               max: 33 -1;
+                               fixed: 1 0;
+                               align: 1.0 0.5;
+                               rel1 { relative: 1.0 0.0; to: "base"; }
+                               rel2 { relative: 1.0 1.0; to: "base"; }
+                               visible: 0;
+                               color: 0 255 0 100;
+                       }
+               }
                part { name: "elm.swallow.content";
                        type: SWALLOW;
                        scale: 1;
                        repeat_events: 0;
                        clip_to: "clipper";
                        description { state: "default" 0.0;
-                               rel1 { relative: 0.0 1.0; to_x: "base"; to_y: "title_expand"; }
-                               rel2 { relative: 1.0 0.0; to_x: "base"; to_y: "button_padding"; }
+                               rel1 { relative: 1.0 1.0; to_x: "left_padding_content"; to_y: "title_expand"; }
+                               rel2 { relative: 0.0 0.0; to_x: "right_padding_content"; to_y: "button_padding"; }
                        }
                }
                part { name: "elm.swallow.circle_bg";
@@ -2741,7 +2788,7 @@ images {
        image, "./b_ic_press_full_circle_bg.png" COMP;
 }
 
-group { name: "elm/panel/right1/default";
+group { name: "elm/panel/right/default";
    script {
       public mouse_down = 0;
       public mouse_click = 0;
@@ -3244,8 +3291,8 @@ group { name: "elm/panel/right1/default";
    }
 }
 
-group { name: "elm/panel/left1/default";
-   inherit: "elm/panel/right1/default";
+group { name: "elm/panel/left/default";
+   inherit: "elm/panel/right/default";
    parts {
       part { name: "cue.padding";
          type: SPACER;
@@ -3460,8 +3507,8 @@ group { name: "elm/panel/left1/default";
    }
 }
 
-group { name: "elm/panel/left_sending/default";
-       inherit: "elm/panel/left1/default";
+group { name: "elm/panel/left/sending";
+       inherit: "elm/panel/left/default";
        parts {
                part { name: "cue.padding";
                   type: SPACER;
@@ -3517,8 +3564,8 @@ group { name: "elm/panel/left_sending/default";
        }
 }
 
-group { name: "elm/panel/left_confirm/default";
-       inherit: "elm/panel/left_sending/default";
+group { name: "elm/panel/left/confirm";
+       inherit: "elm/panel/left/sending";
        parts {
                part { name: "cue";
                   description { state: "default" 0.0;