Merge branch 'tizen_2.1' of ssh://tizendev.org:29418/apps/home/settings 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 b364cb8..fe3d903 100755 (executable)
--- a/setting-common/include/setting-common-data-type.h
+++ b/setting-common/include/setting-common-data-type.h
@@ -1,22 +1,18 @@
 /*
  * setting
+ * Copyright (c) 2012 Samsung Electronics Co., Ltd.
  *
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd.
- *
- * Contact: MyoungJune Park <mj2004.park@samsung.com>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed under the Flora License, Version 1.1 (the License);
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *     http://floralicense.org/license/
  *
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
+ * distributed under the License is distributed on an AS IS BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- *
  */
 
 /**
@@ -193,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,
@@ -232,7 +229,8 @@ typedef enum _POPUP_BTN_RESPONSE_TYPE{
 } POPUP_BTN_RESPONSE_TYPE;
 
 typedef enum {
-       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;