Change-Id: I79ba6c0ef25d39fd3d3b2d296fb752d48aea79c3
Signed-off-by: Joohyun Kim <joohyune.kim@samsung.com>
SysTryReturnResult(NID_SYS, pSettingEvent != null, E_SYSTEM, "listener event is not ready.");
result r = pSettingEvent->AddSettingEventListener(listener);
SysTryReturnResult(NID_SYS, pSettingEvent != null, E_SYSTEM, "listener event is not ready.");
result r = pSettingEvent->AddSettingEventListener(listener);
+ SysLog(NID_SYS, "Add Setting event result is %s for internal.", GetErrorMessage(r));
+
if (r == E_INVALID_OPERATION)
{
r = E_SYSTEM;
if (r == E_INVALID_OPERATION)
{
r = E_SYSTEM;
SysTryReturnResult(NID_SYS, pSettingEvent != null, E_SYSTEM, "listener event is not ready.");
result r = pSettingEvent->RemoveSettingEventListener(listener);
SysTryReturnResult(NID_SYS, pSettingEvent != null, E_SYSTEM, "listener event is not ready.");
result r = pSettingEvent->RemoveSettingEventListener(listener);
+ SysLog(NID_SYS, "Remove setting event result is %s for internal.", GetErrorMessage(r));
SysTryReturnResult(NID_SYS, r == E_SUCCESS, r, "It is failed to remove event listener.");
SysTryReturnResult(NID_SYS, r == E_SUCCESS, r, "It is failed to remove event listener.");
* @brief This is the implementation file for _SysSettingInfoImpl class.
*/
#include <system/system_settings.h>
* @brief This is the implementation file for _SysSettingInfoImpl class.
*/
#include <system/system_settings.h>
#include <FBase.h>
#include <FBaseColArrayList.h>
#include <FBaseSysLog.h>
#include <FBase.h>
#include <FBaseColArrayList.h>
#include <FBaseSysLog.h>
+#include <FApp_AppInfo.h>
#include <FBase_StringConverter.h>
#include <FBase_NativeError.h>
#include <FSys_SettingInfoImpl.h>
#include <FBase_StringConverter.h>
#include <FBase_NativeError.h>
#include <FSys_SettingInfoImpl.h>
//Font
static const wchar_t* _FONT_SIZE = L"http://tizen.org/setting/font.size";
//Font
static const wchar_t* _FONT_SIZE = L"http://tizen.org/setting/font.size";
+static const wchar_t* _FONTSIZE = L"FontSize";
static const wchar_t* _FONT_TYPE = L"http://tizen.org/setting/font.type";
static const wchar_t* _FONT_TYPE = L"http://tizen.org/setting/font.type";
+static const wchar_t* _FONTTYPE = L"FontType";
static const wchar_t* _FONT_SIZE_GIANT = L"giant";
static const wchar_t* _FONT_SIZE_HUGE = L"huge";
static const wchar_t* _FONT_SIZE_GIANT = L"giant";
static const wchar_t* _FONT_SIZE_HUGE = L"huge";
- if (key == _FONT_SIZE || key == _FONT_TYPE)
+ if (key == _FONT_SIZE || key == _FONT_TYPE || key == _FONTSIZE || key == _FONTTYPE)
- r = GetValueForFont(key, value);
+ String tizenKey(key);
+ if(tizenKey == _FONTSIZE)
+ {
+ tizenKey = _FONT_SIZE;
+ }
+ else if(tizenKey == _FONTTYPE)
+ {
+ tizenKey = _FONT_TYPE;
+ }
+
+ r = GetValueForFont(tizenKey, value);
+
+ if(key == _FONTSIZE)
+ {
+ if(_AppInfo::GetApiVersion() == _API_VERSION_2_0 && _AppInfo::IsOspCompat() == true)
+ {
+ if(value == _FONT_SIZE_GIANT || value == _FONT_SIZE_HUGE)
+ {
+ value = _FONT_SIZE_LARGE; //OSP not support giant or huge size of font.
+ }
+ }
+ }