projects
/
apps
/
core
/
preloaded
/
settings.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "packaging: spec cleanup" into tizen
[apps/core/preloaded/settings.git]
/
setting-common
/
include
/
setting-common-data-slp-setting.h
diff --git
a/setting-common/include/setting-common-data-slp-setting.h
b/setting-common/include/setting-common-data-slp-setting.h
index
3173686
..
635bba8
100755
(executable)
--- a/
setting-common/include/setting-common-data-slp-setting.h
+++ b/
setting-common/include/setting-common-data-slp-setting.h
@@
-1,22
+1,18
@@
/*
* setting
/*
* 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
*
* 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
*
* 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.
* 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.
- *
*/
*/
@@
-195,11
+191,6
@@
typedef enum {
BOOL_SLP_SETTING_ACCESSIBILITY_ACCEPT_CALL,
BOOL_SLP_SETTING_ACCESSIBILITY_POWERKEY_END_CALLS,
BOOL_SLP_SETTING_ACCESSIBILITY_ACCEPT_CALL,
BOOL_SLP_SETTING_ACCESSIBILITY_POWERKEY_END_CALLS,
- // data usage
- BOOL_SLP_SETTING_DATAUSAGE_MOBILE_DATA_BOOL,
- BOOL_SLP_SETTING_DATAUSAGE_DISABLE_MOBILE_DATA_AT_LIMIT_BOOL,
- BOOL_SLP_SETTING_DATAUSAGE_RESTRICT_BG_DATA_BOOL,
- BOOL_SLP_SETTING_DATAUSAGE_SHOW_WIFI_USAGE_BOOL,
/* end */
SETTING_BOOL_SLP_LIST_MAX
} setting_bool_slp_list;
/* end */
SETTING_BOOL_SLP_LIST_MAX
} setting_bool_slp_list;