From: Junghwan Song Date: Tue, 28 Aug 2012 07:03:07 +0000 (+0900) Subject: sync with private git X-Git-Tag: 2.0_alpha^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;p=platform%2Fcore%2Fappfw%2Fvconf-internal-keys.git sync with private git --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 86ed527..d835726 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,6 +20,7 @@ INSTALL(FILES ${CMAKE_SOURCE_DIR}/include/vconf-internal-keys.h DESTINATION ${IN INSTALL(FILES ${CMAKE_SOURCE_DIR}/include/vconf-internal-account-keys.h DESTINATION ${INCLUDEDIR}) INSTALL(FILES ${CMAKE_SOURCE_DIR}/include/vconf-internal-admin-keys.h DESTINATION ${INCLUDEDIR}) INSTALL(FILES ${CMAKE_SOURCE_DIR}/include/vconf-internal-alarm-keys.h DESTINATION ${INCLUDEDIR}) +INSTALL(FILES ${CMAKE_SOURCE_DIR}/include/vconf-internal-allshare-keys.h DESTINATION ${INCLUDEDIR}) INSTALL(FILES ${CMAKE_SOURCE_DIR}/include/vconf-internal-boot-animation-keys.h DESTINATION ${INCLUDEDIR}) INSTALL(FILES ${CMAKE_SOURCE_DIR}/include/vconf-internal-browser-keys.h DESTINATION ${INCLUDEDIR}) INSTALL(FILES ${CMAKE_SOURCE_DIR}/include/vconf-internal-bt-keys.h DESTINATION ${INCLUDEDIR}) diff --git a/debian/changelog b/debian/changelog index e9216f8..8cf8e15 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,18 @@ +vconf-internal-keys (0.0.22) unstable; urgency=low + + * Add vconf key for camera shutter sound policy + * Git: magnolia/framework/appfw/vconf-internal-keys + * Tag: vconf-internal-keys_0.0.22 + + -- Jeongmo Yang Wed, 22 Aug 2012 15:06:16 +0900 + vconf-internal-keys (0.0.20) unstable; urgency=low - * Delete allshare-keys because allshare is not opened. + * Add vconf key for allshare * Git: magnolia/framework/appfw/vconf-internal-keys * Tag: vconf-internal-keys_0.0.20 - -- Youngae Kang Mon, 13 Aug 2012 20:46:03 +0900 + -- Youngae Kang Mon, 13 Aug 2012 22:16:10 +0900 vconf-internal-keys (0.0.17) unstable; urgency=low diff --git a/include/vconf-internal-allshare-keys.h b/include/vconf-internal-allshare-keys.h new file mode 100644 index 0000000..05c57fa --- /dev/null +++ b/include/vconf-internal-allshare-keys.h @@ -0,0 +1,156 @@ +/* + * vconf-internal-keys + * + * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. + * + * Contact: Hakjoo Ko , MinSeo Park + * + * Licensed under the Apache License, Version 2.0 (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 + * + * Unless required by applicable law or agreed to in writing, software + * 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. + * + */ + +#ifndef __VCONF_INTERNAL_ALLSHARE_KEYS_H__ +#define __VCONF_INTERNAL_ALLSHARE_KEYS_H__ + +/** + * This file defines keys and values of Allshare. + * + * @file vconf-internal-allshare-keys.h + * @defgroup vconf_internal_allshare_key Definitions of internal shared Keys for allshare + * @ingroup vconf_internal_key + * @author minseo.park@samsung.com + * @version 0.1 + * @brief This file has the definitions of shared keys for allshare \n + */ + +/* ========================== Allshare Setting Keys & Values ============================ */ +/** + * @addtogroup vconf_internal_allshare_key + * @{ + * @brief Allshare Setting Keys & Values\n + * Maintainer : minseo.park@samsung.com + */ + +/** + * @brief File sharing(local DMS) on/off(int) + * + * Disabled = 0 \n + * Enabled = 1 + */ +#define VCONFKEY_ALLSHARE_STATUS "db/allshare/status" +enum +{ + VCONFKEY_ALLSHARE_DISABLE = 0, + VCONFKEY_ALLSHARE_ENABLE = 1 +}; + +/** + * @brief How often warning popup is shown(int) + * + * Show always = 0 \n + * Don't ask again = 1 + */ +#define VCONFKEY_ALLSHARE_SHOW_WARNING_STATE "db/allshare/show_warning" +enum +{ + VCONFKEY_ALLSHARE_SHOW_WARNING_ALWAYS = 0, + VCONFKEY_ALLSHARE_SHOW_WARNING_NOMORE = 1 +}; + +/** + * @brief Accept uploading contents from other devices to my device or not(int) + * + * always accept = 0 \n + * alwats ask = 1 \n + * alwats reject = 2 + */ +#define VCONFKEY_ALLSHARE_UPLOAD_STATUS "db/allshare/upload_status" +enum +{ + VCONFKEY_ALLSHARE_UPLOAD_ALWAYS_ACCEPT = 0, + VCONFKEY_ALLSHARE_UPLOAD_ALWAYS_ASK = 1, + VCONFKEY_ALLSHARE_UPLOAD_ALWAYS_REJECT = 2 +}; + +/** + * @brief Shared media type of my device(int) + * + * combination of below + * Image : 1 + * Video : 2 + * Music : 4 + */ +#define VCONFKEY_ALLSHARE_SHARE_MEDIA_TYPE "db/allshare/share_media_type" +enum +{ + VCONFKEY_ALLSHARE_SHARE_MEDIA_TYPE_IMAGE = 1, + VCONFKEY_ALLSHARE_SHARE_MEDIA_TYPE_VIDEO = 2, + VCONFKEY_ALLSHARE_SHARE_MEDIA_TYPE_MUSIC = 4 +}; + +/** + * @brief Saved file path for files uploaded from other device(string) \n + * If files are uploaded from other device, files are saved to this path. \n + * If SD card is inserted and download location is set to SD card, this path should be set to SD card, too. + */ +#define VCONFKEY_ALLSHARE_DOWNLOAD_PATH "db/allshare/download_path" + +/** + * @brief Access control status(int) \n + * If the value is "Always all", my device can share media contents to any devices. \n + * Or if the value is "Only allowed device", my device can share media contents to the allowed devices. + * + * Always all = 0 \n + * Only allowed device = 1 + */ +#define VCONFKEY_ALLSHARE_ACCESS_CONTROL_STATUS "db/allshare/access_control_status" +enum +{ + VCONFKEY_ALLSHARE_ACCESS_CONTROL_ALWAYS_ALL = 0, + VCONFKEY_ALLSHARE_ACCESS_CONTROL_ONLY_ALLOWED_DEVICE = 1 +}; + +/** + * @brief Saved location of downloaded files.(int) + * + * Phone storage = 0 \n + * External storage(SD card) = 1 + * + */ +#define VCONFKEY_ALLSHARE_DOWNLOAD_LOCATION "db/allshare/download_location" +enum +{ + VCONFKEY_ALLSHARE_DOWNLOAD_LOCATION_PHONE = 0, + VCONFKEY_ALLSHARE_DOWNLOAD_LOCATION_MMC = 1 +}; + +/** + * @brief AllShare service(allshare-svc) state (int) + * + * Allshare service process is not started = 0 \n + * Allshare service process is starting = 1 \n + * Allshare service process is started = 2 + */ +#define VCONFKEY_ALLSHARE_SERVICE_STATE "memory/allshare/service_state" +enum +{ + VCONFKEY_ALLSHARE_SERVICE_NOT_STARTED = 0, + VCONFKEY_ALLSHARE_SERVICE_STARTING = 1, + VCONFKEY_ALLSHARE_SERVICE_STARTED = 2 +}; + +/** + * @} + */ + +#endif /* __VCONF_INTERNAL_ALLSHARE_KEYS_H__ */ diff --git a/include/vconf-internal-camera-keys.h b/include/vconf-internal-camera-keys.h index 24dccf9..32dc875 100644 --- a/include/vconf-internal-camera-keys.h +++ b/include/vconf-internal-camera-keys.h @@ -59,6 +59,18 @@ enum { VCONFKEY_CAMERA_STATE_RECORDING_PAUSE }; +/** + * @brief Camera shutter sound policy + * + * 0 : OFF + * 1 : ON + */ +#define VCONFKEY_CAMERA_SHUTTER_SOUND_POLICY "file/camera/shutter_sound_policy" +enum { + VCONFKEY_CAMERA_SHUTTER_SOUND_POLICY_OFF, + VCONFKEY_CAMERA_SHUTTER_SOUND_POLICY_ON +}; + /** * @} */ diff --git a/include/vconf-internal-keys.h b/include/vconf-internal-keys.h index 802e60e..69d617a 100755 --- a/include/vconf-internal-keys.h +++ b/include/vconf-internal-keys.h @@ -38,6 +38,7 @@ #include "vconf-internal-account-keys.h" #include "vconf-internal-admin-keys.h" #include "vconf-internal-alarm-keys.h" +#include "vconf-internal-allshare-keys.h" #include "vconf-internal-boot-animation-keys.h" #include "vconf-internal-browser-keys.h" #include "vconf-internal-bt-keys.h" diff --git a/include/vconf-internal-rcs-keys.h b/include/vconf-internal-rcs-keys.h index ac921cf..8419db5 100755 --- a/include/vconf-internal-rcs-keys.h +++ b/include/vconf-internal-rcs-keys.h @@ -64,6 +64,12 @@ */ #define VCONFKEY_RCS_MY_DISPLAY_NAME VCONFKEY_RCS_IM_DB_PREFIX"/profile_name" +/** + * @brief last name of User to be communicated to other end as though presence information. + * + */ +#define VCONFKEY_RCS_MY_DISPLAY_LAST_NAME VCONFKEY_RCS_IM_DB_PREFIX"/last_name" + /** * @brief My image to be communicated to other end as though presence information. * @@ -103,6 +109,15 @@ */ #define VCONFKEY_RCS_BUBBLE_FONT_SIZE VCONFKEY_RCS_IM_DB_PREFIX"/text_font_size" +/** + * @brief integer value for background image to be used + * + * 0 - Dynamic image value + * 1-9 predefined image + */ +#define VCONFKEY_RCS_BACKGROUND_IMAGE_INDEX VCONFKEY_RCS_IM_DB_PREFIX"/background_image_index" + + /** * @brief enableing push Pop-up feature * @@ -137,6 +152,18 @@ */ #define VCONFKEY_RCS_RINGTONE_VALUE VCONFKEY_RCS_IM_DB_PREFIX"/notification_ringtone" +/** + * @brief File Max size + * + */ +#define VCONFKEY_RCS_FILE_MAX_SIZE VCONFKEY_RCS_IM_DB_PREFIX"/ft_max_size" + +/** + * @brief Free Memory Size + * + */ +#define VCONFKEY_RCS_FREE_MEMORY_SIZE VCONFKEY_RCS_IM_DB_PREFIX"/free_memory" + /** * @} diff --git a/include/vconf-internal-telephony-keys.h b/include/vconf-internal-telephony-keys.h index 80a5437..35549db 100755 --- a/include/vconf-internal-telephony-keys.h +++ b/include/vconf-internal-telephony-keys.h @@ -485,6 +485,14 @@ enum { */ #define VCONFKEY_3G_ENABLE "db/setting/3gEnabled" +/** + * @brief it stands for telephony server is ready or not + * + * TRUE : telephony server is ready \n + * FALSE : telephony server is not ready \m + */ +#define VCONFKEY_TELEPHONY_READY VCONFKEY_TELEPHONY_PREFIX"/telephony_ready" + /** * @} */ diff --git a/packaging/vconf-internal-keys.spec b/packaging/vconf-internal-keys.spec index a9cb754..43a474f 100755 --- a/packaging/vconf-internal-keys.spec +++ b/packaging/vconf-internal-keys.spec @@ -1,6 +1,6 @@ Name: vconf-internal-keys Summary: Internal shared keys for vconf -Version: 0.0.20 +Version: 0.0.24 Release: 0 Group: Development/Headers License: Apache License, Version 2.0