Merge branch 'Rsa tizen_2.2' into tizen

Conflicts:
	packaging/osp-uifw.spec
	res/common/usr/share/osp/bitmaps/720x1280/00_popup_bg.#.png
	res/common/usr/share/osp/bitmaps/720x1280/default/00_contacts_button_focus.#.png
	res/common/usr/share/osp/bitmaps/720x1280/default/00_popup_bottom_bg.#.png
	src/app/FApp_CoordinateInfo.cpp
	src/app/FApp_ThemeInfo.cpp
	src/graphics/FGrp_BitmapImpl.cpp
	src/graphics/FGrp_FontRsrcManager.cpp
	src/graphics/opengl/FGrpEgl.cpp
	src/graphics/text/FGrp_TextTextCutLinkParser.cpp
	src/ui/FUi_Clipboard.cpp
	src/ui/FUi_Control.cpp
	src/ui/FUi_ControlManager.cpp
	src/ui/FUi_DataBinding.cpp
	src/ui/FUi_DimmingLayer.cpp
	src/ui/FUi_EcoreEvas.cpp
	src/ui/FUi_EflUiEventManager.cpp
	src/ui/FUi_FocusManagerImpl.cpp
	src/ui/FUi_ResourceManager.cpp
	src/ui/FUi_UiFocusEvent.cpp
	src/ui/FUi_UiTouchEvent.cpp
	src/ui/FUi_Window.cpp
	src/ui/animations/FUiAnim_Debug.cpp
	src/ui/animations/FUiAnim_EflLayer.cpp
	src/ui/controls/FUiCtrl_AnimationPresenter.cpp
	src/ui/controls/FUiCtrl_Button.cpp
	src/ui/controls/FUiCtrl_ButtonPresenter.cpp
	src/ui/controls/FUiCtrl_CheckButtonPresenter.cpp
	src/ui/controls/FUiCtrl_ColorPicker.cpp
	src/ui/controls/FUiCtrl_ContextMenuGridPresenter.cpp
	src/ui/controls/FUiCtrl_ContextMenuListPresenter.cpp
	src/ui/controls/FUiCtrl_DateTimeBar.cpp
	src/ui/controls/FUiCtrl_EditCopyPasteManager.cpp
	src/ui/controls/FUiCtrl_EditDate.cpp
	src/ui/controls/FUiCtrl_EditDatePresenter.cpp
	src/ui/controls/FUiCtrl_EditPresenter.cpp
	src/ui/controls/FUiCtrl_EditTime.cpp
	src/ui/controls/FUiCtrl_EditTimePresenter.cpp
	src/ui/controls/FUiCtrl_GroupContainerPresenter.cpp
	src/ui/controls/FUiCtrl_HeaderImpl.cpp
	src/ui/controls/FUiCtrl_Indicator.cpp
	src/ui/controls/FUiCtrl_ListViewImpl.cpp
	src/ui/controls/FUiCtrl_OptionMenu.cpp
	src/ui/controls/FUiCtrl_OptionMenuItem.cpp
	src/ui/controls/FUiCtrl_OptionMenuPresenter.cpp
	src/ui/controls/FUiCtrl_OverlayAgent.cpp
	src/ui/controls/FUiCtrl_OverlayPanelImpl.cpp
	src/ui/controls/FUiCtrl_SearchBar.cpp
	src/ui/controls/FUiCtrl_SearchBarPresenter.cpp
	src/ui/controls/FUiCtrl_Slider.cpp
	src/ui/controls/FUiCtrl_SliderPresenter.cpp
	src/ui/controls/FUiCtrl_SplitPanel.cpp
	src/ui/controls/FUiCtrl_Tab.cpp
	src/ui/controls/FUiCtrl_TabBarPresenter.cpp
	src/ui/controls/FUiCtrl_TableView.cpp
	src/ui/controls/FUiCtrl_TableViewItem.cpp
	src/ui/controls/FUiCtrl_TableViewPresenter.cpp
	src/ui/controls/FUiCtrl_TokenEditPresenter.cpp
	src/ui/controls/FUiCtrl_Toolbar.cpp
	src/ui/controls/FUiCtrl_ToolbarPresenter.cpp
	src/ui/inc/FUiAnim_EflLayer.h
	src/ui/inc/FUiCtrl_EditDatePresenter.h
	src/ui/inc/FUiCtrl_EditTimePresenter.h
	src/ui/inc/FUiCtrl_OverlayAgent.h
	src/ui/inc/FUiCtrl_ScrollPanelPresenter.h
	src/ui/inc/FUiCtrl_SearchBar.h
	src/ui/inc/FUiCtrl_SliderPresenter.h
	src/ui/inc/FUiCtrl_TableView.h
	src/ui/inc/FUiCtrl_TableViewItem.h
	src/ui/inc/FUiCtrl_TableViewPresenter.h
	src/ui/inc/FUi_Control.h
	src/ui/inc/FUi_FocusManagerImpl.h
	src/ui/inc/FUi_ResourceHeaderConfig.h
	src/ui/inc/FUi_ResourceManager.h
	src/ui/inc/FUi_ResourceOptionMenuConfig.h
	src/ui/inc/FUi_Window.h
	src/ui/resource/FUi_ResourceOptionMenuConfig.cpp

Change-Id: I4fbcc22563c8328af1bec99c95ca52ac0c94e976

diff --cc packaging/osp-uifw.spec
index 8900373,9c09bad..46e24b4
mode 100755,100644..100644
--- 1/packaging/osp-uifw.spec
--- 2/packaging/osp-uifw.spec
+++ b/packaging/osp-uifw.spec
@@@ -1,36 -1,37 +1,36 @@@
- Name:           osp-uifw
- Version:        1.2.2.1
- Release:        60
- License:        Apache-2.0 or Flora
- Summary:        The UI Framework library of OSP
- Group:          Graphics & UI Framework/Libraries
- Source0:        %{name}-%{version}.tar.gz
 -%define debug_package %{nil}
+ %define __strip /bin/true
+ 
+ Name:       osp-uifw
+ Summary:    The UI Framework library of OSP
+ Version:    1.2.2.1
+ Release:    62
+ Group:      TO_BE/FILLED_IN
+ License:    TO BE FILLED IN
+ Source0:    %{name}-%{version}.tar.gz
  BuildRequires:  cmake
- BuildRequires:  lua-devel
- BuildRequires:  osp-appfw-internal-devel
- BuildRequires:  osp-image-core-internal-devel
- BuildRequires:  tolua++
+ BuildRequires:  pkgconfig(capi-appfw-application)
+ BuildRequires:  pkgconfig(capi-system-info)
+ BuildRequires:  pkgconfig(capi-system-device)
+ BuildRequires:  pkgconfig(capi-system-runtime-info)
+ BuildRequires:  pkgconfig(bundle)
  BuildRequires:  pkgconfig(appcore-common)
  BuildRequires:  pkgconfig(appcore-efl)
+ BuildRequires:  pkgconfig(sensor)
  BuildRequires:  pkgconfig(appsvc)
- BuildRequires:  pkgconfig(bundle)
  BuildRequires:  pkgconfig(cairo)
- BuildRequires:  pkgconfig(capi-appfw-application)
- BuildRequires:  pkgconfig(capi-system-device)
- BuildRequires:  pkgconfig(capi-system-info)
- BuildRequires:  pkgconfig(capi-system-runtime-info)
  BuildRequires:  pkgconfig(chromium)
- BuildRequires:  pkgconfig(dbus-1)
  BuildRequires:  pkgconfig(dlog)
- BuildRequires:  pkgconfig(ecore)
+ BuildRequires:  pkgconfig(dbus-1)
  BuildRequires:  pkgconfig(edbus)
  BuildRequires:  pkgconfig(elementary)
- BuildRequires:  pkgconfig(ethumb)
  BuildRequires:  pkgconfig(evas)
- BuildRequires:  pkgconfig(feedback)
- BuildRequires:  pkgconfig(freetype2)
- BuildRequires:  pkgconfig(fribidi)
+ BuildRequires:  pkgconfig(ecore)
+ BuildRequires:  pkgconfig(ethumb)
+ BuildRequires:  pkgconfig(ewebkit2)
+ BuildRequires:  pkgconfig(xdamage)
  BuildRequires:  pkgconfig(gles20)
+ BuildRequires:  pkgconfig(fribidi)
+ BuildRequires:  pkgconfig(freetype2)
  BuildRequires:  pkgconfig(glib-2.0)
  BuildRequires:  pkgconfig(harfbuzz)
  BuildRequires:  pkgconfig(icu-i18n)

diff --cc src/ui/controls/FUiCtrl_EditTimePresenter.cpp
Simple merge