From d32f994b41189814e23507b7b50f686e984fe3fd Mon Sep 17 00:00:00 2001 From: Joohyun Kim Date: Wed, 5 Jun 2013 21:35:15 +0900 Subject: [PATCH] Add input.keys.menu and input.keys.back features Change-Id: I46c9925ff24b7b2e6764bf6da390b676f269018f Signed-off-by: Joohyun Kim --- src/CMakeLists.txt | 1 + src/system/FSys_SystemInfoImpl.cpp | 30 +++++++++++++++++++++++++----- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 615c26a..e136c33 100755 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -42,6 +42,7 @@ pkg_check_modules(pkgs REQUIRED capi-system-system-settings capi-system-media-key capi-network-bluetooth + capi-system-info security-server ) diff --git a/src/system/FSys_SystemInfoImpl.cpp b/src/system/FSys_SystemInfoImpl.cpp index 6b7542a..2b586c2 100644 --- a/src/system/FSys_SystemInfoImpl.cpp +++ b/src/system/FSys_SystemInfoImpl.cpp @@ -21,6 +21,7 @@ #include #include +#include #include #include @@ -569,13 +570,32 @@ _SystemInfoImpl::GetSysInfo(const String& key, bool& value) return E_SUCCESS; } - r = GetFromRegistry(tizenKey, value); - if(r != E_SUCCESS) + if(key == L"http://tizen.org/feature/input.keys.menu") { - _SystemClient* pSystemClient = _SystemClient::GetInstance(); - r = pSystemClient->GetValue(tizenKey, value); + bool supported = false; + int ret = system_info_get_platform_bool("tizen.org/feature/input.keys.menu", &supported); + SysTryReturnResult(NID_SYS, ret == 0, E_SYSTEM, "It is failed to get system information from configration file."); + value = supported; + r = E_SUCCESS; + } + else if(key == L"http://tizen.org/feature/input.keys.back") + { + bool supported = false; + int ret = system_info_get_platform_bool("tizen.org/feature/input.keys.back", &supported); + SysTryReturnResult(NID_SYS, ret == 0, E_SYSTEM, "It is failed to get system information from configration file."); + value = supported; + r = E_SUCCESS; + } + else + { + r = GetFromRegistry(tizenKey, value); + if(r != E_SUCCESS) + { + _SystemClient* pSystemClient = _SystemClient::GetInstance(); + r = pSystemClient->GetValue(tizenKey, value); + } + SysTryReturnResult(NID_SYS, r == E_SUCCESS, E_OBJ_NOT_FOUND, "It is failed to get the key[%ls]", tizenKey.GetPointer()); } - SysTryReturnResult(NID_SYS, r == E_SUCCESS, E_OBJ_NOT_FOUND, "It is failed to get the key[%ls]", tizenKey.GetPointer()); if(r == E_SUCCESS) { -- 2.7.4