Merge master into tizen_2.1 for Slider and EEA
authorAyush <ayush.sriv@samsung.com>
Tue, 21 May 2013 06:16:08 +0000 (11:46 +0530)
committerAyush <ayush.sriv@samsung.com>
Tue, 21 May 2013 06:16:08 +0000 (11:46 +0530)
commit5617ed7f7a846a8fd27110e3c7a69595eeadb9c0
treeb177ee643258eebb5ddc3d6d99eda605127f29d2
parentefd31abcaadcaa3c1f83e1059e08c629d599f3f7
Merge master into tizen_2.1 for Slider and EEA

Change-Id: I52d53559371fb79c2b6ed0924bace5ab06e8d296
Signed-off-by: Ayush <ayush.sriv@samsung.com>
20 files changed:
res/common/usr/share/osp/bitmaps/480x800/00_contacts_button_focus.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/480x800/00_slider_handle_focus.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/480x800/black/00_contacts_button_focus_ef.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/480x800/default/00_contacts_button_focus_ef.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/480x800/white/00_contacts_button_focus_ef.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/720x1280/00_contacts_button_focus.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/720x1280/black/00_contacts_button_focus_ef.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/720x1280/default/00_contacts_button_focus_ef.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/720x1280/white/00_contacts_button_focus_ef.#.png [new file with mode: 0644]
src/ui/controls/FUiCtrl_SearchBar.cpp
src/ui/controls/FUiCtrl_Slider.cpp
src/ui/controls/FUiCtrl_SliderPresenter.cpp
src/ui/controls/FUiCtrl_TokenEditPresenter.cpp
src/ui/inc/FUiCtrl_Slider.h
src/ui/inc/FUiCtrl_SliderPresenter.h
src/ui/inc/FUiCtrl_TokenEditPresenter.h
src/ui/inc/FUi_ResourceSliderConfig.h
src/ui/inc/FUi_ResourceTokenEditConfig.h
src/ui/resource/FUi_ResourceSliderConfig.cpp
src/ui/resource/FUi_ResourceTokenEditConfig.cpp