[Genlist] add textblock style in 2text.1icon and dialogue/2text.1icon.6

[platform/core/uifw/efl-theme-tizen.git] / themes / widgets / genlist / genlist_normal.edc

diff --git a/themes/widgets/genlist/genlist_normal.edc b/themes/widgets/genlist/genlist_normal.edc
index 3f605e9..91fc4a4 100644 (file)
--- a/themes/widgets/genlist/genlist_normal.edc
+++ b/themes/widgets/genlist/genlist_normal.edc
@@ -54,7 +54,7 @@
             )
          )
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_NORMAL
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text"; target: "elm.swallow.icon"; target: "elm.swallow.end"; )
       GENLIST_PROGRAM_SOUND("elm.text")
@@ -68,61 +68,29 @@
       alias: "elm/layout/item/editfield/default";
 
       GENLIST_PROLOG_NORMAL
-      images {
-         image: "00_edit_field_rename.png" COMP;
-      }
 
-      data.item: "contents" "elm.icon.entry elm.icon.eraser";
+      data.item: "contents" "elm.icon.entry";
 
       parts {
          GENLIST_PART_BASE
          GENLIST_PART_BG_NORMAL
          GENLIST_PART_BOTTOM_LINE
-         GENLIST_PART_PADDING_LEFT
-         GENLIST_PART_PADDING_RIGHT
-         GENLIST_PART_PADDING_TOP_SIZE(29)
-         GENLIST_PART_PADDING_BOTTOM_SIZE(27)
+         GENLIST_PART_PADDING_LEFT_SIZE(16)
+         GENLIST_PART_PADDING_RIGHT_SIZE(16)
+         GENLIST_PART_PADDING_TOP_SIZE(8)
+         GENLIST_PART_PADDING_BOTTOM_SIZE(8)
 
          GENLIST_PART_ICON("elm.icon.entry",
             GENLIST_DESCRIPTION(
-               "elm.padding.left", "elm.icon.eraser",
-               "elm.padding.top", "elm.padding.bottom",
-               min: 0 48; // This is tuned value for exact entry size.
-            )
-         )
-         GENLIST_PART_IMAGE("elm.image.rename",
-            mouse_events: 0;
-            GENLIST_DESCRIPTION_ENVELOP("elm.icon.eraser",
-               fixed: 1 0;
-               visible: 1;
-               image.normal: "00_edit_field_rename.png";
-               min: GENLIST_ICON_ENTRY_SIZE GENLIST_ICON_ENTRY_SIZE;
-               max: GENLIST_ICON_ENTRY_SIZE GENLIST_ICON_ENTRY_SIZE;
-               color: GENLIST_ENTRY_RENAME_COLOR;
-            )
-            description { state: "hide" 0.0;
-               inherit: "default" 0.0;
-               visible: 0;
-            }
-         )
-         GENLIST_PART_ICON("elm.icon.eraser",
-            GENLIST_DESCRIPTION_RTB("elm.padding.right",
+               "elm.padding.left", "elm.padding.right",
                "elm.padding.top", "elm.padding.bottom",
-               fixed: 1 0;
-               visible: 0;
-               min: GENLIST_ICON_ENTRY_SIZE GENLIST_ICON_ENTRY_SIZE;
-               max: GENLIST_ICON_ENTRY_SIZE GENLIST_ICON_ENTRY_SIZE;
+               min: 0 96; // This is tuned value for exact entry size.
             )
-            description { state: "show" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
          )
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_NORMAL
       }
-      GENLIST_PROGRAMS_NORMAL( target: "elm.icon.entry"; target: "elm.image.rename"; )
-      GENLIST_PROGRAMS_ENTRY
+      GENLIST_PROGRAMS_ENTRY( target: "elm.icon.entry"; )
    }
 
 // 2.2.6.1 (without genlist background)
@@ -143,63 +111,32 @@
       alias: "elm/layout/editfield/title/default";
 
       GENLIST_PROLOG_NORMAL
-      images {
-         image: "00_edit_field_rename.png" COMP;
-      }
-      data.item: "contents" "elm.icon.entry elm.icon.eraser";
+      data.item: "contents" "elm.icon.entry";
       data.item: "texts" "elm.text";
       parts {
          GENLIST_PART_BASE
          GENLIST_PART_BG_NORMAL
          GENLIST_PART_BOTTOM_LINE
-         GENLIST_PART_PADDING_LEFT
-         GENLIST_PART_PADDING_RIGHT
-         GENLIST_PART_PADDING_TOP_SIZE(22)
-         GENLIST_PART_PADDING_BOTTOM_SIZE(22)
+         GENLIST_PART_PADDING_LEFT_SIZE( 16 )
+         GENLIST_PART_PADDING_RIGHT_SIZE( 16 )
+         GENLIST_PART_PADDING_TOP_SIZE(17)
+         GENLIST_PART_PADDING_BOTTOM_SIZE(16)
 
+         GENLIST_PART_PADDING_L_SIZE("elm.padding.title", "elm.padding.left", 10)
          GENLIST_PART_SUBITEM_SETTINGS_LRT("elm.text", GENLIST_HEIGHT_2LINE_SUB,
-            "elm.padding.left", "elm.padding.right", "elm.padding.top"
+            "elm.padding.title", "elm.padding.right", "elm.padding.top"
          )
          GENLIST_PART_ICON("elm.icon.entry",
             GENLIST_DESCRIPTION(
-               "elm.padding.left", "elm.icon.eraser",
-               "elm.text", "elm.padding.bottom",
-               min: 0 48; // This is tuned value for exact entry size.
-            )
-         )
-         GENLIST_PART_IMAGE("elm.image.rename",
-            mouse_events: 0;
-            GENLIST_DESCRIPTION_ENVELOP("elm.icon.eraser",
-               visible: 1;
-               fixed: 1 0;
-               image.normal: "00_edit_field_rename.png";
-               min: GENLIST_ICON_ENTRY_SIZE GENLIST_ICON_ENTRY_SIZE;
-               max: GENLIST_ICON_ENTRY_SIZE GENLIST_ICON_ENTRY_SIZE;
-               color: GENLIST_ENTRY_RENAME_COLOR;
-            )
-            description { state: "hide" 0.0;
-               inherit: "default" 0.0;
-               visible: 0;
-            }
-         )
-         GENLIST_PART_ICON("elm.icon.eraser",
-            GENLIST_DESCRIPTION_RTB("elm.padding.right",
+               "elm.padding.left", "elm.padding.right",
                "elm.text", "elm.padding.bottom",
-               fixed: 1 0;
-               visible: 0;
-               min: GENLIST_ICON_ENTRY_SIZE GENLIST_ICON_ENTRY_SIZE;
-               max: GENLIST_ICON_ENTRY_SIZE GENLIST_ICON_ENTRY_SIZE;
+               min: 0 62; // This is tuned value for exact entry size.
             )
-            description { state: "show" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
          )
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_NORMAL
       }
-      GENLIST_PROGRAMS_NORMAL( target: "elm.text"; target: "elm.icon.entry"; target: "elm.image.rename"; )
-      GENLIST_PROGRAMS_ENTRY
+      GENLIST_PROGRAMS_ENTRY( target: "elm.text"; target: "elm.icon.entry"; )
    }
 
 // 2.2.6.2 (without genlist background)
@@ -237,13 +174,13 @@
             )
          )
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_NORMAL
       }
       GENLIST_PROGRAM_DEFAULT( target: "elm.icon"; )
       GENLIST_PROGRAM_DISABLED( target: "elm.icon"; )
       GENLIST_PROGRAM_SELECT( target: "elm.icon"; )
       GENLIST_PROGRAM_FLIP
-      GENLIST_PROGRAM_FOCUS
+      GENLIST_PROGRAM_FOCUS_NORMAL
    }
 
    group { GENLIST_NAME("1icon/with_no_line/default")
@@ -310,7 +247,7 @@
             "elm.padding.top", "elm.padding.bottom",
          )
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_NORMAL
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text"; )
       GENLIST_PROGRAM_SOUND("elm.text")
@@ -333,7 +270,7 @@
             "elm.padding.top", "elm.padding.bottom",
          )
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_NORMAL
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text"; )
       GENLIST_PROGRAM_SOUND("elm.text")
@@ -361,7 +298,7 @@
             "elm.padding.top", "elm.padding.bottom"
          )
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_NORMAL
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; )
       GENLIST_PROGRAM_SOUND("elm.text.1")
@@ -407,7 +344,7 @@
          GENLIST_PART_ICON_BTN_01_RTB("elm.icon",
             "elm.padding.right", "elm.padding.top", "elm.padding.bottom")
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_NORMAL
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text"; target: "elm.icon"; )
       GENLIST_PROGRAM_SOUND("elm.text")
@@ -446,6 +383,7 @@
 
       parts {
          GENLIST_PART_ICON_THUMBNAIL1_R("elm.icon", "elm.padding.right")
+         GENLIST_PART_FOCUS_NORMAL
       }
    }
 
@@ -497,7 +435,7 @@
          GENLIST_PART_PADDING_R("elm.padding.icon1.left", "elm.icon.1")
          GENLIST_PART_ICON_THUMBNAIL1_R("elm.icon.1", "elm.padding.right")
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_NORMAL
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text"; target: "elm.icon.1"; target: "elm.icon.2"; )
       GENLIST_PROGRAM_SOUND("elm.text")
@@ -533,7 +471,7 @@
          GENLIST_PART_PADDING_R("elm.padding.icon1.left", "elm.icon.1")
          GENLIST_PART_ICON_THUMBNAIL1_R("elm.icon.1", "elm.padding.right")
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_NORMAL
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text"; target: "elm.icon.1"; target: "elm.icon.2"; )
       GENLIST_PROGRAM_SOUND("elm.text")
@@ -576,7 +514,7 @@
          GENLIST_PART_LISTITEM_LR("elm.text", GENLIST_HEIGHT_1LINE,
             "elm.padding.icon.right", "elm.padding.right", )
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_NORMAL
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text"; target: "elm.icon"; )
       GENLIST_PROGRAM_SOUND("elm.text")
@@ -619,7 +557,7 @@
          GENLIST_PART_PADDING_L("elm.padding.icon.right", "elm.icon")
          GENLIST_PART_LISTITEM_LR_TB("elm.text", GENLIST_HEIGHT_1LINE, "elm.padding.icon.right", "elm.padding.right",)
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_NORMAL
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text"; target: "elm.icon"; )
       GENLIST_PROGRAM_SOUND("elm.text")
@@ -645,7 +583,35 @@
          GENLIST_PART_LISTITEM_LR("elm.text.1", GENLIST_HEIGHT_1LINE, "elm.padding.icon.right", "elm.text.2",)
          GENLIST_PART_SUBITEM_R("elm.text.2", GENLIST_HEIGHT_1LINE, "elm.padding.right")
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_NORMAL
+      }
+      GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon"; )
+      GENLIST_PROGRAM_SOUND("elm.text.1")
+      GENLIST_PROGRAM_SOUND("elm.text.2")
+   }
+
+// 2.2.1.11 (textblock)
+   group { GENLIST_NAME("2text.1icon.tb/default")
+      alias: "elm/genlist/item/2text.1icon.6.tb/default";
+      GENLIST_PROLOG_NORMAL
+      data.item: "texts" "elm.text.1 elm.text.2";
+      data.item: "contents" "elm.icon";
+
+      parts {
+         GENLIST_PART_BASE
+         GENLIST_PART_BG_NORMAL
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_LEFT
+         GENLIST_PART_PADDING_RIGHT
+         GENLIST_PART_PADDING_TOP
+         GENLIST_PART_PADDING_BOTTOM
+
+         GENLIST_PART_ICON_BIG_L("elm.icon", "elm.padding.left")
+         GENLIST_PART_PADDING_L("elm.padding.icon.right", "elm.icon")
+         GENLIST_PART_LISTITEM_LR_TB("elm.text.1", GENLIST_HEIGHT_1LINE, "elm.padding.icon.right", "elm.text.2",)
+         GENLIST_PART_SUBITEM_R_TB("elm.text.2", GENLIST_HEIGHT_1LINE, "elm.padding.right")
+         GENLIST_PART_FLIP
+         GENLIST_PART_FOCUS_NORMAL
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon"; )
       GENLIST_PROGRAM_SOUND("elm.text.1")
@@ -687,7 +653,7 @@
          GENLIST_PART_PADDING_R("elm.padding.icon2.left", "elm.icon.2")
          GENLIST_PART_ICON_BTN_01_RTB("elm.icon.2", "elm.padding.right", "elm.padding.top", "elm.padding.bottom")
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_NORMAL
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text"; target: "elm.icon.1"; target: "elm.icon.2"; )
       GENLIST_PROGRAM_SOUND("elm.text")
@@ -714,7 +680,7 @@
          GENLIST_PART_PADDING_R("elm.padding.icon2.left", "elm.icon.2")
          GENLIST_PART_ICON_BTN_01_RTB("elm.icon.2", "elm.padding.right", "elm.padding.top", "elm.padding.bottom")
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_NORMAL
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text"; target: "elm.icon.1"; target: "elm.icon.2"; )
       GENLIST_PROGRAM_SOUND("elm.text")
@@ -810,7 +776,7 @@
          GENLIST_PART_PADDING_L("elm.padding.icon2.right", "elm.icon.2")
          GENLIST_PART_LISTITEM_LR("elm.text", GENLIST_HEIGHT_1LINE, "elm.padding.icon2.right", "elm.padding.right",)
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_NORMAL
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text"; target: "elm.icon.1"; target: "elm.icon.2"; )
       GENLIST_PROGRAM_SOUND("elm.text")
@@ -841,7 +807,7 @@
          GENLIST_PART_PADDING_R("elm.padding.icon3.left", "elm.icon.3")
          GENLIST_PART_ICON_BTN_02_RTB("elm.icon.3", "elm.padding.right", "elm.padding.top", "elm.padding.bottom")
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_NORMAL
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text"; target: "elm.icon.1"; target: "elm.icon.2"; target: "elm.icon.3"; )
       GENLIST_PROGRAM_SOUND("elm.text")
@@ -891,7 +857,7 @@
          GENLIST_PART_PADDING_R("elm.padding.icon3.left", "elm.icon.3")
          GENLIST_PART_ICON_BTN_02_RTB("elm.icon.3", "elm.padding.right", "elm.padding.top", "elm.padding.bottom")
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_NORMAL
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text"; target: "elm.icon.1"; target: "elm.icon.2"; target: "elm.icon.3"; )
       GENLIST_PROGRAM_SOUND("elm.text")
@@ -920,7 +886,7 @@
          GENLIST_PART_SUBITEM_R_FIXED("elm.text.2", 200, GENLIST_HEIGHT_1LINE,
             "elm.padding.right")
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_NORMAL
       }
       GENLIST_PROGRAMS_NORMAL(
          target: "elm.text.1"; target: "elm.text.2";
@@ -951,7 +917,7 @@
          GENLIST_PART_SUBITEM_R_FIXED_TB("elm.text.2", 206, GENLIST_HEIGHT_1LINE,
             "elm.padding.right")
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_NORMAL
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2";
          target: "elm.divider1"; target: "elm.divider2"; )
@@ -981,7 +947,7 @@
          GENLIST_PART_SUBITEM_LR("elm.text.1", GENLIST_HEIGHT_1LINE,
             "elm.divider.right", "elm.padding.right", )
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_NORMAL
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.divider1"; target: "elm.divider2"; )
       GENLIST_PROGRAM_SOUND("elm.text.1")
@@ -1040,7 +1006,7 @@
          GENLIST_PART_SUBITEM_LRB("elm.text.2", GENLIST_HEIGHT_2LINE_SUB,
             "elm.padding.left", "elm.padding.right", "elm.padding.bottom")
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_NORMAL
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; )
       GENLIST_PROGRAM_SOUND("elm.text.1")
@@ -1069,7 +1035,7 @@
             "elm.padding.left", "elm.padding.right", "elm.padding.bottom"
          )
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_NORMAL
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; )
       GENLIST_PROGRAM_SOUND("elm.text.1")
@@ -1098,7 +1064,7 @@
             "elm.text.2", "elm.padding.bottom",
          )
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_NORMAL
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; )
       GENLIST_PROGRAM_SOUND("elm.text.1")
@@ -1129,7 +1095,7 @@
          GENLIST_PART_SUBITEM_LRB("elm.text.2", GENLIST_HEIGHT_2LINE_SUB,
             "elm.padding.left", "elm.padding.right", "elm.padding.bottom")
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_NORMAL
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; )
       GENLIST_PROGRAM_SOUND("elm.text.1")
@@ -1162,7 +1128,7 @@
             "elm.padding.left", "elm.padding.right", "elm.padding.bottom"
          )
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_NORMAL
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; )
       GENLIST_PROGRAM_SOUND("elm.text.1")
@@ -1194,7 +1160,7 @@
          GENLIST_PART_PADDING_R("elm.padding.icon.left", "elm.icon")
          GENLIST_PART_ICON_BTN_01_RTB("elm.icon", "elm.padding.right", "elm.padding.top", "elm.padding.bottom")
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_NORMAL
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon"; )
       GENLIST_PROGRAM_SOUND("elm.text.1")
@@ -1225,7 +1191,7 @@
          GENLIST_PART_PADDING_R("elm.padding.icon.left", "elm.icon")
          GENLIST_PART_ICON_BTN_01_RTB("elm.icon", "elm.padding.right", "elm.padding.top", "elm.padding.bottom")
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_NORMAL
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon"; )
       GENLIST_PROGRAM_SOUND("elm.text.1")
@@ -1267,7 +1233,7 @@
          GENLIST_PART_PADDING_R("elm.padding.icon.left", "elm.icon")
          GENLIST_PART_ICON_BTN_02_RTB("elm.icon", "elm.padding.right", "elm.padding.top", "elm.padding.bottom")
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_NORMAL
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon"; )
       GENLIST_PROGRAM_SOUND("elm.text.1")
@@ -1310,7 +1276,7 @@
          GENLIST_PART_ICON_STAR_RTB("elm.icon.1",
             "elm.padding.right", "elm.padding.top", "elm.text.2")
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_NORMAL
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2";
          target: "elm.icon.1"; target: "elm.icon.2"; target: "elm.icon.3"; target: "elm.icon.4"; target: "elm.icon.5";)
@@ -1350,7 +1316,7 @@
          GENLIST_PART_SUBITEM_RB("elm.text.3", GENLIST_HEIGHT_2LINE_SUB,
             "elm.padding.right", "elm.padding.bottom")
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_NORMAL
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3";
          target: "elm.icon"; )
@@ -1392,7 +1358,7 @@
          GENLIST_PART_SUBITEM_RTB_TB("elm.text.3", GENLIST_HEIGHT_2LINE_SUB,
             "elm.padding.right", "elm.text.1", "elm.padding.bottom")
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_NORMAL
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3";
          target: "elm.icon"; )
@@ -1433,7 +1399,7 @@
             fixed: 1 1;
          )
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_NORMAL
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2";
          target: "elm.icon.1"; target: "elm.icon.2"; )
@@ -1495,7 +1461,7 @@
          GENLIST_PART_PADDING_R("elm.padding.icon.left", "elm.icon")
          GENLIST_PART_ICON_BTN_ONOFF_R("elm.icon", "elm.padding.right")
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_NORMAL
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon"; )
       GENLIST_PROGRAM_SOUND("elm.text.1")
@@ -1554,7 +1520,7 @@
          GENLIST_PART_PADDING_R("elm.padding.icon1.left", "elm.icon.1")
          GENLIST_PART_ICON_BIG_R("elm.icon.1", "elm.padding.right")
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_NORMAL
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2";
          target: "elm.icon.1"; target: "elm.icon.2"; )
@@ -1586,7 +1552,7 @@
          GENLIST_PART_PADDING_R("elm.padding.icon.left", "elm.icon")
          GENLIST_PART_ICON_BIG_R("elm.icon", "elm.padding.right")
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_NORMAL
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2";
          target: "elm.icon"; )
@@ -1617,7 +1583,7 @@
          GENLIST_PART_SUBITEM_LRB("elm.text.2", GENLIST_HEIGHT_2LINE_SUB,
             "elm.padding.icon.right", "elm.padding.right", "elm.padding.bottom")
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_NORMAL
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2";
          target: "elm.icon"; )
@@ -1668,7 +1634,7 @@
          GENLIST_PART_SUBITEM_LRB_TB("elm.text.2", GENLIST_HEIGHT_2LINE_SUB,
             "elm.padding.icon.right", "elm.padding.right", "elm.padding.bottom")
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_NORMAL
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2";
          target: "elm.icon"; )
@@ -1701,7 +1667,7 @@
          GENLIST_PART_SUBITEM_LRB("elm.text.2", GENLIST_HEIGHT_2LINE_SUB,
             "elm.padding.icon.right", "elm.padding.right", "elm.padding.bottom")
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_NORMAL
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3";
          target: "elm.icon"; )
@@ -1762,7 +1728,7 @@
          GENLIST_PART_ICON_STAR_RTB("elm.icon.1",
             "elm.padding.right", "elm.padding.top", "elm.text.2")
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_NORMAL
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2";
          target: "elm.icon.1"; target: "elm.icon.2"; target: "elm.icon.3"; target: "elm.icon.4"; target: "elm.icon.5"; target: "elm.icon.6"; )
@@ -1808,7 +1774,7 @@
          GENLIST_PART_ICON_STAR_RTB("elm.icon.1",
             "elm.padding.right", "elm.padding.top", "elm.text.2")
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_NORMAL
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2";
          target: "elm.icon.1"; target: "elm.icon.2"; target: "elm.icon.3"; target: "elm.icon.4"; target: "elm.icon.5"; target: "elm.icon.6"; )
@@ -1842,7 +1808,7 @@
          GENLIST_PART_PADDING_R("elm.padding.icon2.left", "elm.icon.2")
          GENLIST_PART_ICON_BTN_02_RTB("elm.icon.2", "elm.padding.right", "elm.padding.top", "elm.padding.bottom")
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_NORMAL
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2";
          target: "elm.icon.1"; target: "elm.icon.2"; )
@@ -1877,7 +1843,7 @@
          GENLIST_PART_PADDING_R("elm.padding.icon2.left", "elm.icon.2")
          GENLIST_PART_ICON_BTN_02_RTB("elm.icon.2", "elm.padding.right", "elm.padding.top", "elm.padding.bottom")
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_NORMAL
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2";
          target: "elm.icon.1"; target: "elm.icon.2";)
@@ -1912,7 +1878,7 @@
          GENLIST_PART_ICON_SMALL_RTB("elm.icon.2",
             "elm.padding.right", "elm.text.1", "elm.padding.bottom")
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_NORMAL
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2";
          target: "elm.icon.1"; target: "elm.icon.2";)
@@ -1947,7 +1913,7 @@
          GENLIST_PART_ICON_SMALL_RTB("elm.icon.2",
             "elm.padding.right", "elm.text.1", "elm.padding.bottom")
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_NORMAL
 
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2";
@@ -1982,7 +1948,7 @@
          GENLIST_PART_PADDING_R("elm.padding.icon2.left", "elm.icon.2")
          GENLIST_PART_ICON_BTN_01_RTB("elm.icon.2", "elm.padding.right", "elm.padding.top", "elm.padding.bottom")
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_NORMAL
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2";
          target: "elm.icon.1"; target: "elm.icon.2"; )
@@ -2016,7 +1982,7 @@
          GENLIST_PART_PADDING_R("elm.padding.icon2.left", "elm.icon.2")
          GENLIST_PART_ICON_BTN_01_RTB("elm.icon.2", "elm.padding.right", "elm.padding.top", "elm.padding.bottom")
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_NORMAL
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2";
          target: "elm.icon.1"; target: "elm.icon.2";)
@@ -2042,27 +2008,27 @@
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
          GENLIST_PART_PADDING_RIGHT
-         GENLIST_PART_PADDING_TOP_SIZE( 50 )
-         GENLIST_PART_PADDING_BOTTOM_SIZE( 46 )
+         GENLIST_PART_PADDING_TOP_SIZE( 59 )
+         GENLIST_PART_PADDING_BOTTOM_SIZE( 54 )
 
          GENLIST_PART_ICON_BIG_L("elm.icon.1", "elm.padding.left")
          GENLIST_PART_PADDING_L("elm.padding.icon1.right", "elm.icon.1")
          GENLIST_PART_ICON("elm.swallow.progress", GENLIST_DESCRIPTION(
             "elm.padding.icon1.right", "elm.padding.right",
             "elm.padding.top", "elm.padding.bottom",
-            min: 0 34;)
+            min: 0 27;)
          )
-         GENLIST_PART_SUBITEM_LRT("elm.text.1", 46,
+         GENLIST_PART_SUBITEM_LRT("elm.text.1", 54,
             "elm.padding.icon1.right", "elm.text.2", "elm.swallow.progress")
          GENLIST_PART_SUBITEM("elm.text.2", GENLIST_DESCRIPTION_RT(
             "elm.padding.right", "elm.swallow.progress",
-            min: 0 46;
+            min: 0 54;
             GENLIST_PARAM_SUBITEM_DEFAULT
             GENLIST_PARAM_TEXT_LIMIT_RT
             fixed: 1 1;)
          )
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_NORMAL
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2";
          target: "elm.icon.1"; target: "elm.swallow.progress";)
@@ -2096,26 +2062,26 @@
          GENLIST_PART_LISTITEM("elm.text.1",
             GENLIST_DESCRIPTION_LRT("elm.padding.icon1.right", "elm.padding.icon2.left",
                "elm.padding.top",
-               min: 0 50;
+               min: 0 59;
                GENLIST_PARAM_PROGRESS_MAIN
                fixed: 0 1;
             )
          )
          GENLIST_PART_ICON("elm.swallow.progress",
             GENLIST_DESCRIPTION("elm.padding.icon1.right", "elm.padding.icon2.left", "elm.text.1", "elm.text.2",
-               min: 0 34;
+               min: 0 27;
             )
          )
          GENLIST_PART_SUBITEM("elm.text.2",
             GENLIST_DESCRIPTION_LRB("elm.padding.icon1.right", "elm.text.3", "elm.padding.bottom",
-               min: 0 46;
+               min: 0 54;
                GENLIST_PARAM_SUBITEM_DEFAULT
                fixed: 1 1;
             )
          )
          GENLIST_PART_SUBITEM("elm.text.3",
             GENLIST_DESCRIPTION_RB("elm.padding.icon2.left", "elm.padding.bottom",
-               min: 0 46;
+               min: 0 54;
                GENLIST_PARAM_SUBITEM_DEFAULT
                GENLIST_PARAM_TEXT_LIMIT_RT
                fixed: 1 1; // This limits text growing.
@@ -2128,7 +2094,7 @@
             max: 156 GENLIST_BTN_01_HEIGHT;)
          )
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_NORMAL
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2";
          target: "elm.icon.1"; target: "elm.icon.2"; target: "elm.swallow.progress"; )
@@ -2163,7 +2129,7 @@
          GENLIST_PART_PADDING_R_SIZE("elm.padding.icon.left", "elm.icon", 26)
          GENLIST_PART_ICON_BTN_ONOFF_R("elm.icon", "elm.padding.right")
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_NORMAL
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2";
          target: "elm.icon"; target: "elm.divider1"; target: "elm.divider2"; )
@@ -2212,7 +2178,7 @@
          GENLIST_PART_PADDING_R("elm.padding.icon1.left", "elm.icon.1")
          GENLIST_PART_ICON_THUMBNAIL1_R("elm.icon.1", "elm.padding.right")
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_NORMAL
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2";
          target: "elm.icon.1"; target: "elm.icon.2"; target: "elm.icon.3"; )
@@ -2225,6 +2191,7 @@
       inherit: "elm/genlist/item/2text.1icon.2/default";
       parts {
          GENLIST_PART_ICON_THUMBNAIL1_R("elm.icon", "elm.padding.right")
+         GENLIST_PART_FOCUS_NORMAL
       }
    }
 
@@ -2253,6 +2220,7 @@
       inherit: "elm/genlist/item/2text.1icon.2.tb/default";
       parts {
          GENLIST_PART_ICON_THUMBNAIL1_R("elm.icon", "elm.padding.right")
+         GENLIST_PART_FOCUS_NORMAL
       }
    }
 
@@ -2321,7 +2289,7 @@
          GENLIST_PART_SUBITEM_LRB("elm.text.2", GENLIST_HEIGHT_2LINE_SUB,
             "elm.padding.icon2.right", "elm.padding.right", "elm.padding.bottom")
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_NORMAL
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2";
          target: "elm.icon.1"; target: "elm.icon.2";)
@@ -2357,7 +2325,7 @@
          GENLIST_PART_PADDING_R("elm.padding.icon3.left", "elm.icon.3")
          GENLIST_PART_ICON_BTN_02_RTB("elm.icon.3", "elm.padding.right", "elm.padding.top", "elm.padding.bottom")
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_NORMAL
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; )
       GENLIST_PROGRAM_SOUND("elm.text.1")
@@ -2401,7 +2369,7 @@
          GENLIST_PART_SUBITEM_RTB("elm.text.2", GENLIST_HEIGHT_2LINE_SUB,
             "elm.padding.right", "elm.text.1", "elm.padding.bottom")
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_NORMAL
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; target: "elm.text.4";
          target: "elm.icon.1"; target: "elm.bubble"; )
@@ -2451,7 +2419,7 @@
             "elm.padding.right", "elm.text.1", "elm.padding.bottom"
          )
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_NORMAL
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; target: "elm.text.4";
          target: "elm.icon.1"; target: "elm.bubble"; )
@@ -2493,7 +2461,7 @@
          GENLIST_PART_SUBITEM_RTB("elm.text.2", GENLIST_HEIGHT_2LINE_SUB,
             "elm.padding.right", "elm.text.1", "elm.padding.bottom")
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_NORMAL
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; target: "elm.text.4";
          target: "elm.icon.1";)
@@ -2541,7 +2509,7 @@
             "elm.padding.right", "elm.text.1", "elm.padding.bottom"
          )
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_NORMAL
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; target: "elm.text.4";
          target: "elm.icon.1";)
@@ -2582,7 +2550,49 @@
          GENLIST_PART_SUBITEM_RTB("elm.text.2", GENLIST_HEIGHT_2LINE_SUB,
             "elm.padding.right", "elm.text.1", "elm.padding.bottom")
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_NORMAL
+      }
+      GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; target: "elm.text.4";
+         target: "elm.bubble"; )
+      GENLIST_PROGRAM_SOUND("elm.text.1")
+      GENLIST_PROGRAM_SOUND("elm.text.2")
+      GENLIST_PROGRAM_SOUND("elm.text.3")
+      GENLIST_PROGRAM_SOUND("elm.text.4")
+
+   }
+
+// 2.2.2.40.tb
+   group { GENLIST_NAME("4text.1.tb/default")
+      GENLIST_PROLOG_NORMAL
+      data.item: "texts" "elm.text.1 elm.text.2 elm.text.3 elm.text.4";
+
+      images {
+         image: "00_list_bubble_bg.png" COMP;
+      }
+      parts {
+         GENLIST_PART_BASE
+         GENLIST_PART_BG_NORMAL
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_LEFT
+         GENLIST_PART_PADDING_RIGHT
+         GENLIST_PART_PADDING_TOP_2LINE
+         GENLIST_PART_PADDING_BOTTOM_2LINE
+
+         GENLIST_PART_LISTITEM_TB_("elm.text.1", GENLIST_HEIGHT_2LINE_MAIN,
+            "elm.padding.left", "elm.padding.bubble.left",
+            "elm.padding.top", "elm.text.3",
+         )
+         GENLIST_PART_PADDING_R("elm.padding.bubble.left", "elm.bubble")
+         GENLIST_PART_LIST_BUBBLE_TEXT_RTB("elm.text.4", GENLIST_HEIGHT_2LINE_MAIN,
+            "elm.padding.right", "elm.padding.top", "elm.text.3")
+
+         GENLIST_PART_SUBITEM_LRB_TB("elm.text.3", GENLIST_HEIGHT_2LINE_SUB,
+            "elm.padding.left", "elm.padding.text2.left", "elm.padding.bottom")
+         GENLIST_PART_PADDING_R("elm.padding.text2.left", "elm.text.2")
+         GENLIST_PART_SUBITEM_RTB_TB("elm.text.2", GENLIST_HEIGHT_2LINE_SUB,
+            "elm.padding.right", "elm.text.1", "elm.padding.bottom")
+         GENLIST_PART_FLIP
+         GENLIST_PART_FOCUS_NORMAL
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; target: "elm.text.4";
          target: "elm.bubble"; )
@@ -2593,6 +2603,7 @@
 
    }
 
+
 // 2.2.2.41
    group { GENLIST_NAME("4text.2/default")
       inherit: "elm/genlist/item/4text.1/default";
@@ -2636,7 +2647,7 @@
          GENLIST_PART_SUBITEM_RTB("elm.text.2", GENLIST_HEIGHT_2LINE_SUB,
             "elm.padding.right", "elm.text.1", "elm.padding.bottom")
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_NORMAL
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3";
          target: "elm.icon.1";)
@@ -2674,7 +2685,7 @@
          GENLIST_PART_SUBITEM_RTB_TB("elm.text.2", GENLIST_HEIGHT_2LINE_SUB,
             "elm.padding.right", "elm.text.1", "elm.padding.bottom")
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_NORMAL
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3";
          target: "elm.icon.1";)
@@ -2718,7 +2729,7 @@
          GENLIST_PART_PADDING_R("elm.padding.icon1.left", "elm.icon.1")
          GENLIST_PART_ICON_BIG_R("elm.icon.1", "elm.padding.right")
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_NORMAL
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2";
          target: "elm.icon.1"; target: "elm.icon.2"; target: "elm.icon.3"; target: "elm.icon.4";)
@@ -2765,7 +2776,7 @@
             "elm.padding.right", "elm.text.1", "elm.padding.bottom"
          )
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_NORMAL
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; target: "elm.text.4";
          target: "elm.swallow.colorbar"; target: "elm.icon.1"; target: "elm.bubble"; )
@@ -2800,7 +2811,7 @@
          GENLIST_PART_SUBITEM_RTB("elm.text.3", GENLIST_HEIGHT_2LINE_SUB,
             "elm.padding.right", "elm.text.1", "elm.padding.bottom")
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_NORMAL
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3";
          target: "elm.icon"; )
@@ -2835,7 +2846,7 @@
          GENLIST_PART_PADDING_R("elm.padding.icon2.left", "elm.icon.2")
          GENLIST_PART_ICON_THUMBNAIL1_R("elm.icon.2", "elm.padding.right")
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_NORMAL
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2";
          target: "elm.icon.1"; target: "elm.icon.2";)
@@ -2886,6 +2897,7 @@
             )
             GENLIST_DESCRIPTION_LISTITEM_OTHERS_TB_WRAP
          )
+         GENLIST_PART_CENTER_LINE_LRT("elm.divider2", "bg", "elm.text.1")
          GENLIST_PART_TEXTBLOCK("elm.text.2",
             GENLIST_DESCRIPTION("elm.divider.right", "elm.padding.right", "center_line2", "elm.padding.bottom",
                GENLIST_PARAM_LISTITEM_TB_WRAP
@@ -2893,9 +2905,8 @@
             )
             GENLIST_DESCRIPTION_LISTITEM_OTHERS_TB_WRAP
          )
-         GENLIST_PART_CENTER_LINE_LT("elm.divider2", "elm.text.1")
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_NORMAL
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.title"; target: "elm.text.1"; target: "elm.text.2";
          target: "elm.divider1"; target:"elm.divider2";
@@ -2939,7 +2950,7 @@
             GENLIST_DESCRIPTION_LISTITEM_OTHERS_TB_WRAP
          )
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_NORMAL
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.title";
          target: "elm.text";
@@ -2979,7 +2990,7 @@
             GENLIST_DESCRIPTION_SUBITEM_DEFAULT_OTHERS_TB_WRAP
          )
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_NORMAL
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; )
       GENLIST_PROGRAM_SOUND("elm.text.1")
@@ -3004,8 +3015,8 @@
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
          GENLIST_PART_PADDING_RIGHT
-         GENLIST_PART_PADDING_TOP_SIZE( 16 )
-         GENLIST_PART_PADDING_BOTTOM_SIZE( 16 )
+         GENLIST_PART_PADDING_TOP_SIZE( 10 )
+         GENLIST_PART_PADDING_BOTTOM_SIZE( 10 )
 
          GENLIST_PART_LISTITEM("elm.text.1",
             GENLIST_DESCRIPTION_LRT("elm.padding.left", "elm.padding.icon5.left", "elm.padding.top",
@@ -3026,7 +3037,7 @@
             "elm.padding.right", "elm.padding.top", "elm.text.2")
 
 
-         GENLIST_PART_PADDING_T_SIZE("elm.padding.text1.bottom", "elm.text.1", 16)
+         GENLIST_PART_PADDING_T_SIZE("elm.padding.text1.bottom", "elm.text.1", 14)
          GENLIST_PART_TEXTBLOCK("elm.text.2",
             GENLIST_DESCRIPTION("elm.padding.left", "elm.padding.right", "elm.padding.text1.bottom", "elm.padding.bottom",
             GENLIST_PARAM_SUBITEM_DEFAULT_TB_WRAP
@@ -3034,7 +3045,7 @@
             GENLIST_DESCRIPTION_SUBITEM_DEFAULT_OTHERS_TB_WRAP
          )
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_NORMAL
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; )
       GENLIST_PROGRAM_SOUND("elm.text.1")
@@ -3072,7 +3083,7 @@
             GENLIST_DESCRIPTION_SUBITEM_DEFAULT_OTHERS_TB_WRAP
          )
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_NORMAL
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; )
       GENLIST_PROGRAM_SOUND("elm.text.1")
@@ -3082,26 +3093,26 @@
 /************************************************************/
 /******************** Dialogue Group ************************/
 /************************************************************/
-// 2.2.6.1 (Dialogue)
+// 2.4.3 (Dialogue)
    group { GENLIST_NAME("dialogue/editfield/default")
       alias: "elm/layout/dialogue/editfield/default";
       inherit: "elm/genlist/item/editfield/default";
 
-      data.item: "contents" "elm.icon.entry elm.image.rename elm.icon.eraser elm.icon.edit";
+      data.item: "contents" "elm.icon.entry elm.icon.edit";
 
-      GENLIST_DIALOGUE_INHERIT_BODY( ; )
-      GENLIST_PROGRAMS_DIALOGUE( target: "elm.icon.entry"; target: "elm.image.rename"; target: "elm.icon.edit";)
+      GENLIST_DIALOGUE_EDITFIELD_INHERIT_BODY( ; )
+      GENLIST_PROGRAMS_DIALOGUE_ENTRY( target: "elm.icon.entry"; target: "elm.icon.edit";)
    }
 
-// 2.2.6.2 (Dialogue)
+// 2.4.3 (Dialogue)
    group { GENLIST_NAME("dialogue/editfield/title/default")
       alias: "elm/layout/dialogue/editfield/title/default";
       inherit: "elm/genlist/item/editfield/title/default";
 
-      data.item: "contents" "elm.icon.entry elm.image.rename elm.icon.eraser elm.icon.edit";
+      data.item: "contents" "elm.icon.entry elm.icon.edit";
 
-      GENLIST_DIALOGUE_INHERIT_BODY( ; )
-      GENLIST_PROGRAMS_DIALOGUE( target: "elm.icon.entry"; target: "elm.image.rename"; target: "elm.icon.edit";)
+      GENLIST_DIALOGUE_EDITFIELD_INHERIT_BODY( ; )
+      GENLIST_PROGRAMS_DIALOGUE_ENTRY( target: "elm.icon.entry"; target: "elm.icon.edit";)
    }
 
 // Dialogue Group Separators
@@ -3254,6 +3265,17 @@
       GENLIST_PROGRAMS_DIALOGUE( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon"; )
    }
 
+// 2.4.1.5 (textblock)
+   group { GENLIST_NAME("dialogue/2text.1icon.6.tb/default")
+      alias: "elm/layout/dialogue/2text.1icon.6.tb";
+      inherit: "elm/genlist/item/2text.1icon.tb/default";
+
+      data.item: "contents" "elm.icon elm.icon.edit";
+
+      GENLIST_DIALOGUE_INHERIT_BODY( ; )
+      GENLIST_PROGRAMS_DIALOGUE( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon"; )
+   }
+
 // 2.4.1.6
 // 2.4.1.15
 // 2.5.2.2 & 2.5.2.3 (expandable)
@@ -3763,6 +3785,9 @@
       data.item: "contents" "elm.icon.edit";
 
       GENLIST_DIALOGUE_INHERIT_BODY( ; )
+      parts {
+         GENLIST_PART_CENTER_LINE_LRT("elm.divider2", "bg_dialogue", "elm.text.1")
+      }
       GENLIST_PROGRAMS_DIALOGUE( target: "elm.title";
          target: "elm.text.1"; target: "elm.text.2";
          target: "elm.divider1"; target:"elm.divider2";
@@ -3809,7 +3834,7 @@
       data.item: "contents" "elm.icon.1 elm.icon.2 elm.icon.3 elm.icon.4";
 
       images {
-         image : "00_search_edit_field_bg_02.png" COMP;
+         image : "00_search_edit_field_bg.png" COMP;
       }
       parts {
          GENLIST_PART_BASE
@@ -3969,7 +3994,6 @@
 // 2.4.2.18
    group { GENLIST_NAME("dialogue/multiline/2text/default")
       alias: "elm/layout/dialogue/multiline/2text/default";
-      inherit: "elm/genlist/item/multiline/2text/default";
 
       // FIXME: deprecated name, will be removed
       alias: "elm/genlist/item/multiline/dialogue/2text/default";
@@ -3978,10 +4002,40 @@
       alias: "elm/genlist/item_compress_odd/multiline/dialogue/2text/default";
       alias: "elm/layout/multiline/dialogue/2text/default";
 
+      GENLIST_PROLOG_NORMAL
+      data.item: "texts" "elm.text.1 elm.text.2";
       data.item: "contents" "elm.icon.edit";
 
-      GENLIST_DIALOGUE_INHERIT_BODY( ; )
+      parts {
+         GENLIST_PART_BASE
+         GENLIST_PART_BG_DIALOGUE
+         GENLIST_PART_PADDING_LEFT_SIZE( DIALOGUE_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT_EDIT
+         GENLIST_PART_PADDING_TOP_2LINE
+         GENLIST_PART_PADDING_BOTTOM_2LINE
+         GENLIST_PART_TEXT("elm.text.1",
+            GENLIST_DESCRIPTION_LRT("elm.padding.left", "elm.padding.right", "elm.padding.top",
+               GENLIST_PARAM_LISTITEM
+               min: 0 GENLIST_HEIGHT_2LINE_MAIN;
+               fixed: 0 1;
+            )
+            GENLIST_DESCRIPTION_LISTITEM_OTHERS
+         )
+         GENLIST_PART_PADDING_T_SIZE("elm.padding.text1.bottom", "elm.text.1", 4)
+         GENLIST_PART_TEXTBLOCK("elm.text.2",
+            GENLIST_DESCRIPTION("elm.padding.left", "elm.padding.right", "elm.padding.text1.bottom", "elm.padding.bottom",
+               GENLIST_PARAM_SUBITEM_DEFAULT_TB_WRAP
+               min: 0 GENLIST_HEIGHT_MULTILINE_SUB;
+           )
+            GENLIST_DESCRIPTION_SUBITEM_DEFAULT_OTHERS_TB_WRAP
+         )
+         GENLIST_PART_FLIP
+         GENLIST_PART_FOCUS_DIALOGUE
+      }
+
       GENLIST_PROGRAMS_DIALOGUE( target: "elm.text.1"; target: "elm.text.2"; )
+      GENLIST_PROGRAM_SOUND("elm.text.1")
+      GENLIST_PROGRAM_SOUND("elm.text.2")
    }
 
 // 2.4.2.19
@@ -4069,14 +4123,14 @@
          GENLIST_PART_PADDING_BOTTOM_SIZE( 0 )
          GENLIST_PART_PADDING_RIGHT_SIZE( 26 )
 
+         GENLIST_PART_PADDING_R("elm.padding.icon.right", "elm.icon");
          GENLIST_PART_TEXT("elm.text",
-            GENLIST_DESCRIPTION("elm.padding.left", "elm.icon",
+            GENLIST_DESCRIPTION("elm.padding.left", "elm.padding.icon.right",
                "elm.padding.top", "elm.padding.bottom",
                GENLIST_PARAM_DIALOGUE_GROUP_TITLE
                min: 0 GENLIST_HEIGHT_GROUPTITLE;
             )
          )
-
          GENLIST_PART_ICON("elm.icon",
             GENLIST_DESCRIPTION_RTB("elm.padding.right",
                "elm.padding.top", "elm.padding.bottom",
@@ -4084,9 +4138,10 @@
                fixed: 1 0;
             )
          )
-         GENLIST_PART_FLIP
+         GENLIST_PART_FOCUS_NORMAL
       }
       GENLIST_PROGRAM_DISABLED( target: "elm.text"; target: "elm.icon"; )
+      GENLIST_PROGRAM_FOCUS_NORMAL
    }
 
 // 2.4.4.2 Help Text
@@ -4113,7 +4168,7 @@
             min: 0 38;
          )
          GENLIST_PART_FLIP
-         GENLIST_PART_FOCUS
+         GENLIST_PART_FOCUS_NORMAL
       }
       GENLIST_PROGRAM_DISABLED( target: "elm.text"; )
       GENLIST_PROGRAM_FOCUS
@@ -4132,19 +4187,19 @@
          GENLIST_PART_BASE
          GENLIST_PART_PADDING_LEFT_SIZE( DIALOGUE_PADDING_SIZE_LEFT )
          GENLIST_PART_PADDING_RIGHT_EDIT
-         GENLIST_PART_PADDING_TOP_SIZE(20)
-         GENLIST_PART_PADDING_BOTTOM_SIZE(20)
+         GENLIST_PART_PADDING_TOP_SIZE(19)
+         GENLIST_PART_PADDING_BOTTOM_SIZE(19)
 
          GENLIST_PART_TEXT("elm.text.1",
             GENLIST_DESCRIPTION_LRT("elm.padding.left", "elm.padding.icon.left", "elm.padding.top",
                GENLIST_PARAM_LISTITEM
-               min: 0 54; fixed:1 1;)
+               min: 0 57; fixed:1 1;)
             GENLIST_DESCRIPTION_LISTITEM_OTHERS
          )
          GENLIST_PART_TEXT("elm.text.2",
             GENLIST_DESCRIPTION("elm.padding.left", "elm.padding.icon.left", "elm.text.1", "elm.padding.bottom",
                GENLIST_PARAM_SUBITEM_DEFAULT
-               min: 0 42;)
+               min: 0 45;)
             GENLIST_DESCRIPTION_SUBITEM_DEFAULT_OTHERS
          )
 
@@ -4174,25 +4229,26 @@
          GENLIST_PART_BASE
          GENLIST_PART_PADDING_LEFT_SIZE( DIALOGUE_PADDING_SIZE_LEFT )
          GENLIST_PART_PADDING_RIGHT_EDIT
-         GENLIST_PART_PADDING_TOP_SIZE(20)
-         GENLIST_PART_PADDING_BOTTOM_SIZE(20)
+         GENLIST_PART_PADDING_TOP_SIZE(19)
+         GENLIST_PART_PADDING_BOTTOM_SIZE(19)
 
          GENLIST_PART_TEXT("elm.text.1",
             GENLIST_DESCRIPTION_LRT("elm.padding.left", "elm.padding.icon1.left", "elm.padding.top",
                GENLIST_PARAM_LISTITEM
-               min: 0 54; fixed:1 1;)
+               min: 0 57; fixed:1 1;)
             GENLIST_DESCRIPTION_LISTITEM_OTHERS
          )
+         GENLIST_PART_PADDING_T_SIZE("elm.padding.text1.bottom", "elm.text.1", 4)
          GENLIST_PART_TEXT("elm.text.2",
-            GENLIST_DESCRIPTION("elm.padding.left", "elm.padding.icon1.left", "elm.text.1", "elm.text.3",
+            GENLIST_DESCRIPTION("elm.padding.left", "elm.padding.icon1.left", "elm.padding.text1.bottom", "elm.text.3",
                GENLIST_PARAM_SUBITEM_DEFAULT
-               min: 0 34;)
+               min: 0 38;)
             GENLIST_DESCRIPTION_SUBITEM_DEFAULT_OTHERS
          )
          GENLIST_PART_TEXT("elm.text.3",
             GENLIST_DESCRIPTION_LRB("elm.padding.left", "elm.padding.icon1.left", "elm.padding.bottom",
                GENLIST_PARAM_SUBITEM_DEFAULT
-               min: 0 34; fixed: 1 1; )
+               min: 0 38; fixed: 1 1; )
             GENLIST_DESCRIPTION_SUBITEM_DEFAULT_OTHERS
          )
 
@@ -4318,3 +4374,85 @@
       )
       GENLIST_PROGRAMS_THUMB
    }
+
+// ----------------------------------------------------------------------
+// Pop Up Style ---------------------------------------------------------
+// ----------------------------------------------------------------------
+GENLIST_POPUP_STYLE("default")
+GENLIST_POPUP_STYLE("editfield")
+GENLIST_POPUP_STYLE("editfield/title")
+GENLIST_POPUP_STYLE("1icon")
+GENLIST_POPUP_STYLE("1icon/with_no_line")
+GENLIST_POPUP_STYLE("1icon/no_padding")
+GENLIST_POPUP_STYLE("1icon/no_padding_line")
+GENLIST_POPUP_STYLE("1text")
+GENLIST_POPUP_STYLE("1text.tb")
+GENLIST_POPUP_STYLE("2text")
+GENLIST_POPUP_STYLE("1text.1icon")
+GENLIST_POPUP_STYLE("1text.1icon.6")
+GENLIST_POPUP_STYLE("1text.1icon.7")
+GENLIST_POPUP_STYLE("1text.1icon.5")
+GENLIST_POPUP_STYLE("1text.1icon.5.thumb.circle")
+GENLIST_POPUP_STYLE("1text.1icon.5.thumb.square")
+GENLIST_POPUP_STYLE("1text.2icon.3")
+GENLIST_POPUP_STYLE("1text.2icon.3.tb")
+GENLIST_POPUP_STYLE("1text.1icon.2")
+GENLIST_POPUP_STYLE("1text.1icon.2.tb")
+GENLIST_POPUP_STYLE("2text.1icon")
+GENLIST_POPUP_STYLE("2text.1icon.tb")
+GENLIST_POPUP_STYLE("1text.2icon")
+GENLIST_POPUP_STYLE("1text.2icon.tb")
+GENLIST_POPUP_STYLE("1text.2icon.6")
+GENLIST_POPUP_STYLE("1text.2icon.6.tb")
+GENLIST_POPUP_STYLE("1text.1icon.3")
+GENLIST_POPUP_STYLE("1text.1icon.3.tb")
+GENLIST_POPUP_STYLE("1text.2icon.4")
+GENLIST_POPUP_STYLE("1text.2icon.2")
+GENLIST_POPUP_STYLE("1text.3icon")
+GENLIST_POPUP_STYLE("1text.2icon.9")
+GENLIST_POPUP_STYLE("1text.3icon.2")
+GENLIST_POPUP_STYLE("2text.1icon.divider")
+GENLIST_POPUP_STYLE("1text.2icon.divider")
+GENLIST_POPUP_STYLE("2text.2")
+GENLIST_POPUP_STYLE("2text.2.tb")
+GENLIST_POPUP_STYLE("2text.3")
+GENLIST_POPUP_STYLE("3text")
+GENLIST_POPUP_STYLE("3text.tb")
+GENLIST_POPUP_STYLE("2text.1icon.2")
+GENLIST_POPUP_STYLE("2text.1icon.2.tb")
+GENLIST_POPUP_STYLE("2text.1icon.10")
+GENLIST_POPUP_STYLE("2text.1icon.10.tb")
+GENLIST_POPUP_STYLE("3text.1icon")
+GENLIST_POPUP_STYLE("3text.1icon.tb")
+GENLIST_POPUP_STYLE("2text.2icon")
+GENLIST_POPUP_STYLE("2text.1icon.4")
+GENLIST_POPUP_STYLE("2text.1icon.4.thumb.circle")
+GENLIST_POPUP_STYLE("2text.1icon.4.thumb.square")
+GENLIST_POPUP_STYLE("2text.1icon.4.tb")
+GENLIST_POPUP_STYLE("3text.1icon.2")
+GENLIST_POPUP_STYLE("2text.2icon.4")
+GENLIST_POPUP_STYLE("2text.2icon.4.tb")
+GENLIST_POPUP_STYLE("2text.2icon.6")
+GENLIST_POPUP_STYLE("2text.2icon.6.tb")
+GENLIST_POPUP_STYLE("2text.2icon.8")
+GENLIST_POPUP_STYLE("2text.2icon.8.tb")
+GENLIST_POPUP_STYLE("2text.2icon.progress")
+GENLIST_POPUP_STYLE("3text.3icon.progress")
+GENLIST_POPUP_STYLE("2text.1icon.12")
+GENLIST_POPUP_STYLE("2text.1icon.12.tb")
+GENLIST_POPUP_STYLE("2text.1icon.7")
+GENLIST_POPUP_STYLE("2text.2icon.5")
+GENLIST_POPUP_STYLE("2text.3icon.4")
+GENLIST_POPUP_STYLE("4text.1icon.1")
+GENLIST_POPUP_STYLE("4text.1icon.1.tb")
+GENLIST_POPUP_STYLE("4text.1icon.2")
+GENLIST_POPUP_STYLE("4text.1icon.2.tb")
+GENLIST_POPUP_STYLE("4text.1")
+GENLIST_POPUP_STYLE("4text.1.tb")
+GENLIST_POPUP_STYLE("4text.2")
+GENLIST_POPUP_STYLE("3text.1icon.3")
+GENLIST_POPUP_STYLE("3text.1icon.3.tb")
+GENLIST_POPUP_STYLE("4text.1icon.3")
+GENLIST_POPUP_STYLE("3text.1icon.1")
+GENLIST_POPUP_STYLE("2text.2icon.1")
+GENLIST_POPUP_STYLE("2text.1icon.1")