Merge branch 'master' into tizen_2.1

[apps/core/preloaded/settings.git] / setting-common / include / setting-common-data-type.h

diff --git a/setting-common/include/setting-common-data-type.h b/setting-common/include/setting-common-data-type.h
index d023704..7cc3dc9 100755 (executable)
--- a/setting-common/include/setting-common-data-type.h
+++ b/setting-common/include/setting-common-data-type.h
@@ -189,6 +189,7 @@ typedef enum _SWALLOW_Type {
        SWALLOW_Type_1CHECKICON = 4,
        SWALLOW_Type_1RADIO = 5,
        SWALLOW_Type_1TOGGLE = 6,
+       SWALLOW_Type_1ICON_1PROCESS,
        SWALLOW_Type_MULTILINE_1TOGGLE,
 
        SWALLOW_Type_1ICON_1IMAGE,
@@ -228,8 +229,8 @@ typedef enum _POPUP_BTN_RESPONSE_TYPE{
 } POPUP_BTN_RESPONSE_TYPE;
 
 typedef enum {
-       SETTING_GROUP_STYLE_NONE = -1,
-       SETTING_GROUP_STYLE_TOP = 0,
+       SETTING_GROUP_STYLE_NONE = 0,
+       SETTING_GROUP_STYLE_TOP,
        SETTING_GROUP_STYLE_CENTER,
        SETTING_GROUP_STYLE_BOTTOM
 } setting_group_style;