apply v3.2 gui for toolbar

Change-Id: I0c89f4279acd5c83b71894d996187a61218cffa0

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_badge_bg.#.png b/res/common/usr/share/osp/bitmaps/480x800/00_badge_bg.#.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_button_01.#.png b/res/common/usr/share/osp/bitmaps/480x800/00_button_01.#.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_button_01_ef_dim.#.png b/res/common/usr/share/osp/bitmaps/480x800/00_button_01_ef_dim.#.png
deleted file mode 100755 (executable)
index 934658a..0000000
Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_button_01_ef_dim.#.png and /dev/null differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_button_01_focus.png b/res/common/usr/share/osp/bitmaps/480x800/00_button_01_focus.png
new file mode 100644 (file)
index 0000000..0afe188
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/00_button_01_focus.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_button_on_off_handler.png b/res/common/usr/share/osp/bitmaps/480x800/00_button_on_off_handler.png
deleted file mode 100755 (executable)
index b6575ed..0000000
Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_button_on_off_handler.png and /dev/null differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_button_on_off_handler_focus.png b/res/common/usr/share/osp/bitmaps/480x800/00_button_on_off_handler_focus.png
new file mode 100644 (file)
index 0000000..5198b9e
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/00_button_on_off_handler_focus.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_circle_bg.png b/res/common/usr/share/osp/bitmaps/480x800/00_circle_bg.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_circle_button_focus.png b/res/common/usr/share/osp/bitmaps/480x800/00_circle_button_focus.png
new file mode 100644 (file)
index 0000000..5ad3621
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/00_circle_button_focus.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_icon_Back.png b/res/common/usr/share/osp/bitmaps/480x800/00_icon_Back.png
old mode 100755 (executable)
new mode 100644 (file)
index 7e6851d..db80592
Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_icon_Back.png and b/res/common/usr/share/osp/bitmaps/480x800/00_icon_Back.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_icon_Back_trans_ef.png b/res/common/usr/share/osp/bitmaps/480x800/00_icon_Back_trans_ef.png
old mode 100755 (executable)
new mode 100644 (file)
index e30f090..ecb77e2
Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_icon_Back_trans_ef.png and b/res/common/usr/share/osp/bitmaps/480x800/00_icon_Back_trans_ef.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_icon_SIP_close.png b/res/common/usr/share/osp/bitmaps/480x800/00_icon_SIP_close.png
new file mode 100644 (file)
index 0000000..75ddda9
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/00_icon_SIP_close.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_icon_more.png b/res/common/usr/share/osp/bitmaps/480x800/00_icon_more.png
old mode 100755 (executable)
new mode 100644 (file)
index 81e0c98..98c00fe
Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_icon_more.png and b/res/common/usr/share/osp/bitmaps/480x800/00_icon_more.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_option_panel_handle_bg.png b/res/common/usr/share/osp/bitmaps/480x800/00_option_panel_handle_bg.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_option_panel_handle_bg_ef.png b/res/common/usr/share/osp/bitmaps/480x800/00_option_panel_handle_bg_ef.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_option_panel_handle_bg_ef_press.png b/res/common/usr/share/osp/bitmaps/480x800/00_option_panel_handle_bg_ef_press.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_option_panel_handle_bg_press.png b/res/common/usr/share/osp/bitmaps/480x800/00_option_panel_handle_bg_press.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_option_panel_handle_more.png b/res/common/usr/share/osp/bitmaps/480x800/00_option_panel_handle_more.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_option_panel_handle_more_press.png b/res/common/usr/share/osp/bitmaps/480x800/00_option_panel_handle_more_press.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_softkey_icon_add.png b/res/common/usr/share/osp/bitmaps/480x800/00_softkey_icon_add.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_softkey_icon_zoom.png b/res/common/usr/share/osp/bitmaps/480x800/00_softkey_icon_zoom.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_softkey_left_bg.png b/res/common/usr/share/osp/bitmaps/480x800/00_softkey_left_bg.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_softkey_left_bg_ef.png b/res/common/usr/share/osp/bitmaps/480x800/00_softkey_left_bg_ef.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_softkey_left_bg_ef_press.png b/res/common/usr/share/osp/bitmaps/480x800/00_softkey_left_bg_ef_press.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_softkey_left_text_bg.png b/res/common/usr/share/osp/bitmaps/480x800/00_softkey_left_text_bg.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_softkey_left_text_bg_ef.png b/res/common/usr/share/osp/bitmaps/480x800/00_softkey_left_text_bg_ef.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_softkey_left_text_bg_ef_press.png b/res/common/usr/share/osp/bitmaps/480x800/00_softkey_left_text_bg_ef_press.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_softkey_right_bg.png b/res/common/usr/share/osp/bitmaps/480x800/00_softkey_right_bg.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_softkey_right_bg_ef.png b/res/common/usr/share/osp/bitmaps/480x800/00_softkey_right_bg_ef.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_softkey_right_bg_ef_press.png b/res/common/usr/share/osp/bitmaps/480x800/00_softkey_right_bg_ef_press.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_softkey_right_text_bg.png b/res/common/usr/share/osp/bitmaps/480x800/00_softkey_right_text_bg.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_softkey_right_text_bg_ef.png b/res/common/usr/share/osp/bitmaps/480x800/00_softkey_right_text_bg_ef.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_softkey_right_text_bg_ef_press.png b/res/common/usr/share/osp/bitmaps/480x800/00_softkey_right_text_bg_ef_press.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_tab_focus.#.png b/res/common/usr/share/osp/bitmaps/480x800/00_tab_focus.#.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_toolbar_button.#.png b/res/common/usr/share/osp/bitmaps/480x800/00_toolbar_button.#.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_toolbar_button_bg.#.png b/res/common/usr/share/osp/bitmaps/480x800/00_toolbar_button_bg.#.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_toolbar_button_ef_focus.#.png b/res/common/usr/share/osp/bitmaps/480x800/00_toolbar_button_ef_focus.#.png
new file mode 100644 (file)
index 0000000..e8737a2
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/00_toolbar_button_ef_focus.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_toolbar_button_ef_press.#.png b/res/common/usr/share/osp/bitmaps/480x800/00_toolbar_button_ef_press.#.png
deleted file mode 100755 (executable)
index 1c72730..0000000
Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_toolbar_button_ef_press.#.png and /dev/null differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_toolbar_button_press.#.png b/res/common/usr/share/osp/bitmaps/480x800/00_toolbar_button_press.#.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_icon_Back_ef_02.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_badge_bg_ef.#.png
old mode 100755 (executable)
new mode 100644 (file)
similarity index 55%
rename from res/common/usr/share/osp/bitmaps/720x1280/00_icon_Back_ef_02.png
rename to res/common/usr/share/osp/bitmaps/480x800/black/00_badge_bg_ef.#.png
index e9a6c7c..5bd71c0
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_icon_Back_ef_02.png and b/res/common/usr/share/osp/bitmaps/480x800/black/00_badge_bg_ef.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_button_01_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_button_01_ef.#.png
new file mode 100644 (file)
index 0000000..48d34d5
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/black/00_button_01_ef.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_icon_Hide_ef_02.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_button_01_ef_dim.#.png
similarity index 72%
rename from res/common/usr/share/osp/bitmaps/480x800/00_icon_Hide_ef_02.png
rename to res/common/usr/share/osp/bitmaps/480x800/black/00_button_01_ef_dim.#.png
index 8aba36c..88fcf23 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_icon_Hide_ef_02.png and b/res/common/usr/share/osp/bitmaps/480x800/black/00_button_01_ef_dim.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_button_01_ef_press.#.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_button_01_ef_press.#.png
new file mode 100644 (file)
index 0000000..3939650
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/black/00_button_01_ef_press.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_button_left_ef.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_button_left_ef.png
new file mode 100644 (file)
index 0000000..7364de4
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/black/00_button_left_ef.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_button_off.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_button_off.png
new file mode 100644 (file)
index 0000000..a5837b7
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/black/00_button_off.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_button_off_dim.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_button_off_dim.png
new file mode 100644 (file)
index 0000000..ece0ccd
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/black/00_button_off_dim.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_button_on.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_button_on.png
new file mode 100644 (file)
index 0000000..9cc9921
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/black/00_button_on.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_button_on_dim.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_button_on_dim.png
new file mode 100644 (file)
index 0000000..b18f5ac
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/black/00_button_on_dim.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_button_on_off_handler.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_button_on_off_handler.png
new file mode 100644 (file)
index 0000000..decc3ee
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/black/00_button_on_off_handler.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_button_on_off_handler_dim.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_button_on_off_handler_dim.png
new file mode 100644 (file)
index 0000000..705dbaa
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/black/00_button_on_off_handler_dim.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_button_right_ef.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_button_right_ef.png
new file mode 100644 (file)
index 0000000..3378050
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/black/00_button_right_ef.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_circle_bg_ef.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_circle_bg_ef.png
new file mode 100644 (file)
index 0000000..eaa029b
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/black/00_circle_bg_ef.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_circle_bg_ef_dim.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_circle_bg_ef_dim.png
new file mode 100644 (file)
index 0000000..7d37899
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/black/00_circle_bg_ef_dim.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_circle_bg_ef_press.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_circle_bg_ef_press.png
new file mode 100644 (file)
index 0000000..c330be4
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/black/00_circle_bg_ef_press.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_icon_Back_ef.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_icon_Back_ef.png
new file mode 100644 (file)
index 0000000..d87ebee
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/black/00_icon_Back_ef.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_icon_Back_ef_02.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_icon_Back_ef_02.png
new file mode 100644 (file)
index 0000000..25b52ef
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/black/00_icon_Back_ef_02.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_icon_SIP_close_ef.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_icon_SIP_close_ef.png
new file mode 100644 (file)
index 0000000..c2fa1ca
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/black/00_icon_SIP_close_ef.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_icon_more_ef.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_icon_more_ef.png
new file mode 100644 (file)
index 0000000..f8c9a64
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/black/00_icon_more_ef.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_tab_press_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_tab_press_ef.#.png
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from res/common/usr/share/osp/bitmaps/480x800/00_tab_press_ef.#.png
rename to res/common/usr/share/osp/bitmaps/480x800/black/00_tab_press_ef.#.png

diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_toolbar_button_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_toolbar_button_ef.#.png
new file mode 100644 (file)
index 0000000..f300bab
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/black/00_toolbar_button_ef.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_toolbar_button_ef_press.#.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_toolbar_button_ef_press.#.png
new file mode 100644 (file)
index 0000000..85b14cf
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/black/00_toolbar_button_ef_press.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_badge_bg_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_badge_bg_ef.#.png
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from res/common/usr/share/osp/bitmaps/480x800/00_badge_bg_ef.#.png
rename to res/common/usr/share/osp/bitmaps/480x800/white/00_badge_bg_ef.#.png

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_button_01_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_button_01_ef.#.png
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from res/common/usr/share/osp/bitmaps/480x800/00_button_01_ef.#.png
rename to res/common/usr/share/osp/bitmaps/480x800/white/00_button_01_ef.#.png

diff --git a/res/common/usr/share/osp/bitmaps/480x800/white/00_button_01_ef_dim.#.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_button_01_ef_dim.#.png
new file mode 100644 (file)
index 0000000..0fd1f0d
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/white/00_button_01_ef_dim.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_button_01_ef_press.#.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_button_01_ef_press.#.png
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from res/common/usr/share/osp/bitmaps/480x800/00_button_01_ef_press.#.png
rename to res/common/usr/share/osp/bitmaps/480x800/white/00_button_01_ef_press.#.png

diff --git a/res/common/usr/share/osp/bitmaps/480x800/white/00_button_left_ef.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_button_left_ef.png
new file mode 100644 (file)
index 0000000..8053e38
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/white/00_button_left_ef.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_button_off.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_button_off.png
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from res/common/usr/share/osp/bitmaps/480x800/00_button_off.png
rename to res/common/usr/share/osp/bitmaps/480x800/white/00_button_off.png

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_button_off_dim.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_button_off_dim.png
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from res/common/usr/share/osp/bitmaps/480x800/00_button_off_dim.png
rename to res/common/usr/share/osp/bitmaps/480x800/white/00_button_off_dim.png

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_button_on.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_button_on.png
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from res/common/usr/share/osp/bitmaps/480x800/00_button_on.png
rename to res/common/usr/share/osp/bitmaps/480x800/white/00_button_on.png

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_button_on_dim.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_button_on_dim.png
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from res/common/usr/share/osp/bitmaps/480x800/00_button_on_dim.png
rename to res/common/usr/share/osp/bitmaps/480x800/white/00_button_on_dim.png

diff --git a/res/common/usr/share/osp/bitmaps/480x800/white/00_button_on_off_handler.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_button_on_off_handler.png
new file mode 100644 (file)
index 0000000..b8bba8e
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/white/00_button_on_off_handler.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_button_on_off_handler_dim.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_button_on_off_handler_dim.png
old mode 100755 (executable)
new mode 100644 (file)
similarity index 57%
rename from res/common/usr/share/osp/bitmaps/480x800/00_button_on_off_handler_dim.png
rename to res/common/usr/share/osp/bitmaps/480x800/white/00_button_on_off_handler_dim.png
index d008646..75be662
Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_button_on_off_handler_dim.png and b/res/common/usr/share/osp/bitmaps/480x800/white/00_button_on_off_handler_dim.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_button_right_ef.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_button_right_ef.png
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from res/common/usr/share/osp/bitmaps/480x800/00_button_right_ef.png
rename to res/common/usr/share/osp/bitmaps/480x800/white/00_button_right_ef.png

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_circle_bg_ef.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_circle_bg_ef.png
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from res/common/usr/share/osp/bitmaps/480x800/00_circle_bg_ef.png
rename to res/common/usr/share/osp/bitmaps/480x800/white/00_circle_bg_ef.png

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_circle_bg_ef_dim.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_circle_bg_ef_dim.png
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from res/common/usr/share/osp/bitmaps/480x800/00_circle_bg_ef_dim.png
rename to res/common/usr/share/osp/bitmaps/480x800/white/00_circle_bg_ef_dim.png

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_circle_bg_ef_press.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_circle_bg_ef_press.png
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from res/common/usr/share/osp/bitmaps/480x800/00_circle_bg_ef_press.png
rename to res/common/usr/share/osp/bitmaps/480x800/white/00_circle_bg_ef_press.png

diff --git a/res/common/usr/share/osp/bitmaps/480x800/white/00_icon_Back_ef.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_icon_Back_ef.png
new file mode 100644 (file)
index 0000000..e3cdf21
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/white/00_icon_Back_ef.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/white/00_icon_Back_ef_02.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_icon_Back_ef_02.png
new file mode 100644 (file)
index 0000000..cb8df90
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/white/00_icon_Back_ef_02.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/white/00_icon_SIP_close_ef.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_icon_SIP_close_ef.png
new file mode 100644 (file)
index 0000000..f5d0407
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/white/00_icon_SIP_close_ef.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/white/00_icon_more_ef.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_icon_more_ef.png
new file mode 100644 (file)
index 0000000..74b1ef6
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/white/00_icon_more_ef.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_icon_more_ef.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_tab_press_ef.#.png
old mode 100755 (executable)
new mode 100644 (file)
similarity index 86%
rename from res/common/usr/share/osp/bitmaps/480x800/00_icon_more_ef.png
rename to res/common/usr/share/osp/bitmaps/480x800/white/00_tab_press_ef.#.png
index 8a0b4d3..0398c09
Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_icon_more_ef.png and b/res/common/usr/share/osp/bitmaps/480x800/white/00_tab_press_ef.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_toolbar_button_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_toolbar_button_ef.#.png
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from res/common/usr/share/osp/bitmaps/480x800/00_toolbar_button_ef.#.png
rename to res/common/usr/share/osp/bitmaps/480x800/white/00_toolbar_button_ef.#.png

diff --git a/res/common/usr/share/osp/bitmaps/480x800/white/00_toolbar_button_ef_press.#.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_toolbar_button_ef_press.#.png
new file mode 100644 (file)
index 0000000..eb57b7f
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/white/00_toolbar_button_ef_press.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_badge_bg.#.png b/res/common/usr/share/osp/bitmaps/720x1280/00_badge_bg.#.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_button_01.#.png b/res/common/usr/share/osp/bitmaps/720x1280/00_button_01.#.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_button_01_ef_dim.#.png b/res/common/usr/share/osp/bitmaps/720x1280/00_button_01_ef_dim.#.png
deleted file mode 100755 (executable)
index 8304078..0000000
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_button_01_ef_dim.#.png and /dev/null differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_button_01_focus.#.png b/res/common/usr/share/osp/bitmaps/720x1280/00_button_01_focus.#.png
new file mode 100644 (file)
index 0000000..5c8889c
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/00_button_01_focus.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_button_left.png b/res/common/usr/share/osp/bitmaps/720x1280/00_button_left.png
old mode 100755 (executable)
new mode 100644 (file)
index 05833b3..be90710
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_button_left.png and b/res/common/usr/share/osp/bitmaps/720x1280/00_button_left.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_button_on_off_handler.png b/res/common/usr/share/osp/bitmaps/720x1280/00_button_on_off_handler.png
deleted file mode 100755 (executable)
index fe5c3e3..0000000
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_button_on_off_handler.png and /dev/null differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_button_on_off_handler_dim.png b/res/common/usr/share/osp/bitmaps/720x1280/00_button_on_off_handler_dim.png
deleted file mode 100755 (executable)
index ddd8955..0000000
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_button_on_off_handler_dim.png and /dev/null differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_icon_Hide.png b/res/common/usr/share/osp/bitmaps/720x1280/00_button_on_off_handler_focus.png
similarity index 68%
rename from res/common/usr/share/osp/bitmaps/720x1280/00_icon_Hide.png
rename to res/common/usr/share/osp/bitmaps/720x1280/00_button_on_off_handler_focus.png
index eccc9d2..da26c4b 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_icon_Hide.png and b/res/common/usr/share/osp/bitmaps/720x1280/00_button_on_off_handler_focus.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_button_right.png b/res/common/usr/share/osp/bitmaps/720x1280/00_button_right.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_circle_bg.png b/res/common/usr/share/osp/bitmaps/720x1280/00_circle_bg.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_circle_bg_ef_press.png b/res/common/usr/share/osp/bitmaps/720x1280/00_circle_bg_ef_press.png
deleted file mode 100755 (executable)
index bce7779..0000000
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_circle_bg_ef_press.png and /dev/null differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_icon_Back_ef_02.png b/res/common/usr/share/osp/bitmaps/720x1280/00_circle_button_focus.png
old mode 100755 (executable)
new mode 100644 (file)
similarity index 66%
rename from res/common/usr/share/osp/bitmaps/480x800/00_icon_Back_ef_02.png
rename to res/common/usr/share/osp/bitmaps/720x1280/00_circle_button_focus.png
index 50ab2c0..b8f097b
Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_icon_Back_ef_02.png and b/res/common/usr/share/osp/bitmaps/720x1280/00_circle_button_focus.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_icon_Back.png b/res/common/usr/share/osp/bitmaps/720x1280/00_icon_Back.png
old mode 100755 (executable)
new mode 100644 (file)
index e43c557..445a163
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_icon_Back.png and b/res/common/usr/share/osp/bitmaps/720x1280/00_icon_Back.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_icon_Back_ef.png b/res/common/usr/share/osp/bitmaps/720x1280/00_icon_Back_ef.png
deleted file mode 100755 (executable)
index f112661..0000000
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_icon_Back_ef.png and /dev/null differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_icon_Back_trans_ef.png b/res/common/usr/share/osp/bitmaps/720x1280/00_icon_Back_trans_ef.png
old mode 100755 (executable)
new mode 100644 (file)
index bdc869e..cd6012e
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_icon_Back_trans_ef.png and b/res/common/usr/share/osp/bitmaps/720x1280/00_icon_Back_trans_ef.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_icon_Hide_ef.png b/res/common/usr/share/osp/bitmaps/720x1280/00_icon_Hide_ef.png
deleted file mode 100644 (file)
index de75bd5..0000000
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_icon_Hide_ef.png and /dev/null differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_icon_Hide_ef_02.png b/res/common/usr/share/osp/bitmaps/720x1280/00_icon_Hide_ef_02.png
deleted file mode 100644 (file)
index b855c89..0000000
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_icon_Hide_ef_02.png and /dev/null differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_icon_Hide_trans_ef.png b/res/common/usr/share/osp/bitmaps/720x1280/00_icon_Hide_trans_ef.png
deleted file mode 100644 (file)
index 42e8eb4..0000000
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_icon_Hide_trans_ef.png and /dev/null differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_icon_SIP_close.png b/res/common/usr/share/osp/bitmaps/720x1280/00_icon_SIP_close.png
new file mode 100644 (file)
index 0000000..abdb0b8
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/00_icon_SIP_close.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_icon_more.png b/res/common/usr/share/osp/bitmaps/720x1280/00_icon_more.png
old mode 100755 (executable)
new mode 100644 (file)
index deab830..1a2792b
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_icon_more.png and b/res/common/usr/share/osp/bitmaps/720x1280/00_icon_more.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_icon_more_ef.png b/res/common/usr/share/osp/bitmaps/720x1280/00_icon_more_ef.png
deleted file mode 100755 (executable)
index 01278a5..0000000
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_icon_more_ef.png and /dev/null differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_option_panel_handle_bg.png b/res/common/usr/share/osp/bitmaps/720x1280/00_option_panel_handle_bg.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_option_panel_handle_bg_ef.png b/res/common/usr/share/osp/bitmaps/720x1280/00_option_panel_handle_bg_ef.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_option_panel_handle_bg_ef_press.png b/res/common/usr/share/osp/bitmaps/720x1280/00_option_panel_handle_bg_ef_press.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_option_panel_handle_bg_press.png b/res/common/usr/share/osp/bitmaps/720x1280/00_option_panel_handle_bg_press.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_option_panel_handle_more.png b/res/common/usr/share/osp/bitmaps/720x1280/00_option_panel_handle_more.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_option_panel_handle_more_press.png b/res/common/usr/share/osp/bitmaps/720x1280/00_option_panel_handle_more_press.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_softkey_icon_add.png b/res/common/usr/share/osp/bitmaps/720x1280/00_softkey_icon_add.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_softkey_icon_zoom.png b/res/common/usr/share/osp/bitmaps/720x1280/00_softkey_icon_zoom.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_softkey_left_bg.png b/res/common/usr/share/osp/bitmaps/720x1280/00_softkey_left_bg.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_softkey_left_bg_ef.png b/res/common/usr/share/osp/bitmaps/720x1280/00_softkey_left_bg_ef.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_softkey_left_bg_ef_press.png b/res/common/usr/share/osp/bitmaps/720x1280/00_softkey_left_bg_ef_press.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_softkey_left_text_bg.png b/res/common/usr/share/osp/bitmaps/720x1280/00_softkey_left_text_bg.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_softkey_left_text_bg_ef.png b/res/common/usr/share/osp/bitmaps/720x1280/00_softkey_left_text_bg_ef.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_softkey_left_text_bg_ef_press.png b/res/common/usr/share/osp/bitmaps/720x1280/00_softkey_left_text_bg_ef_press.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_softkey_right_bg.png b/res/common/usr/share/osp/bitmaps/720x1280/00_softkey_right_bg.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_softkey_right_bg_ef.png b/res/common/usr/share/osp/bitmaps/720x1280/00_softkey_right_bg_ef.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_softkey_right_bg_ef_press.png b/res/common/usr/share/osp/bitmaps/720x1280/00_softkey_right_bg_ef_press.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_softkey_right_text_bg.png b/res/common/usr/share/osp/bitmaps/720x1280/00_softkey_right_text_bg.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_softkey_right_text_bg_ef.png b/res/common/usr/share/osp/bitmaps/720x1280/00_softkey_right_text_bg_ef.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_softkey_right_text_bg_ef_press.png b/res/common/usr/share/osp/bitmaps/720x1280/00_softkey_right_text_bg_ef_press.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_tab_focus.#.png b/res/common/usr/share/osp/bitmaps/720x1280/00_tab_focus.#.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_toolbar_button.#.png b/res/common/usr/share/osp/bitmaps/720x1280/00_toolbar_button.#.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_toolbar_button_bg.#.png b/res/common/usr/share/osp/bitmaps/720x1280/00_toolbar_button_bg.#.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_toolbar_button_ef_focus.#.png b/res/common/usr/share/osp/bitmaps/720x1280/00_toolbar_button_ef_focus.#.png
new file mode 100644 (file)
index 0000000..a32bfa4
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/00_toolbar_button_ef_focus.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_toolbar_button_ef_press.#.png b/res/common/usr/share/osp/bitmaps/720x1280/00_toolbar_button_ef_press.#.png
deleted file mode 100755 (executable)
index dc328c4..0000000
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_toolbar_button_ef_press.#.png and /dev/null differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_toolbar_button_press.#.png b/res/common/usr/share/osp/bitmaps/720x1280/00_toolbar_button_press.#.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_badge_bg_ef.#.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_badge_bg_ef.#.png
new file mode 100644 (file)
index 0000000..ac9ee83
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_badge_bg_ef.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_01_ef.#.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_01_ef.#.png
new file mode 100644 (file)
index 0000000..86a330d
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_01_ef.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_icon_Hide_ef.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_01_ef_dim.#.png
similarity index 65%
rename from res/common/usr/share/osp/bitmaps/480x800/00_icon_Hide_ef.png
rename to res/common/usr/share/osp/bitmaps/720x1280/black/00_button_01_ef_dim.#.png
index a0fecb4..d6c7cad 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_icon_Hide_ef.png and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_01_ef_dim.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_icon_Back_ef.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_01_ef_press.#.png
old mode 100755 (executable)
new mode 100644 (file)
similarity index 64%
rename from res/common/usr/share/osp/bitmaps/480x800/00_icon_Back_ef.png
rename to res/common/usr/share/osp/bitmaps/720x1280/black/00_button_01_ef_press.#.png
index f78d47d..f5d2ac7
Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_icon_Back_ef.png and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_01_ef_press.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_left_ef.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_left_ef.png
new file mode 100644 (file)
index 0000000..89c8d4c
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_left_ef.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_off.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_off.png
new file mode 100644 (file)
index 0000000..71fe7c3
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_off.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_off_dim.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_off_dim.png
new file mode 100644 (file)
index 0000000..d788539
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_off_dim.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_on.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_on.png
new file mode 100644 (file)
index 0000000..304d34a
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_on.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_on_dim.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_on_dim.png
new file mode 100644 (file)
index 0000000..2804513
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_on_dim.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_on_off_handler.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_on_off_handler.png
new file mode 100644 (file)
index 0000000..3513650
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_on_off_handler.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_on_off_handler_dim.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_on_off_handler_dim.png
new file mode 100644 (file)
index 0000000..f334be7
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_on_off_handler_dim.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_right_ef.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_right_ef.png
new file mode 100644 (file)
index 0000000..6853b59
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_right_ef.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_circle_bg_ef.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_circle_bg_ef.png
new file mode 100644 (file)
index 0000000..5817984
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_circle_bg_ef.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_circle_bg_ef_dim.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_circle_bg_ef_dim.png
new file mode 100644 (file)
index 0000000..5817984
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_circle_bg_ef_dim.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_circle_bg_ef_press.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_circle_bg_ef_press.png
new file mode 100644 (file)
index 0000000..43e220b
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_circle_bg_ef_press.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_icon_Back_ef.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_icon_Back_ef.png
new file mode 100644 (file)
index 0000000..d28a7cb
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_icon_Back_ef.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_icon_Back_ef_02.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_icon_Back_ef_02.png
new file mode 100644 (file)
index 0000000..f26e443
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_icon_Back_ef_02.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_icon_SIP_close_ef.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_icon_SIP_close_ef.png
new file mode 100644 (file)
index 0000000..32607d1
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_icon_SIP_close_ef.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_icon_more_ef.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_icon_more_ef.png
new file mode 100644 (file)
index 0000000..1f365e5
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_icon_more_ef.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_tab_press_ef.#.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_tab_press_ef.#.png
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from res/common/usr/share/osp/bitmaps/720x1280/00_tab_press_ef.#.png
rename to res/common/usr/share/osp/bitmaps/720x1280/black/00_tab_press_ef.#.png

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_toolbar_button_ef.#.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_toolbar_button_ef.#.png
new file mode 100644 (file)
index 0000000..10ed68c
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_toolbar_button_ef.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_toolbar_button_ef_press.#.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_toolbar_button_ef_press.#.png
new file mode 100644 (file)
index 0000000..7e14f85
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_toolbar_button_ef_press.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_badge_bg_ef.#.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_badge_bg_ef.#.png
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from res/common/usr/share/osp/bitmaps/720x1280/00_badge_bg_ef.#.png
rename to res/common/usr/share/osp/bitmaps/720x1280/white/00_badge_bg_ef.#.png

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_button_01_ef.#.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_button_01_ef.#.png
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from res/common/usr/share/osp/bitmaps/720x1280/00_button_01_ef.#.png
rename to res/common/usr/share/osp/bitmaps/720x1280/white/00_button_01_ef.#.png

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/white/00_button_01_ef_dim.#.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_button_01_ef_dim.#.png
new file mode 100644 (file)
index 0000000..3b81648
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/white/00_button_01_ef_dim.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_button_01_ef_press.#.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_button_01_ef_press.#.png
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from res/common/usr/share/osp/bitmaps/720x1280/00_button_01_ef_press.#.png
rename to res/common/usr/share/osp/bitmaps/720x1280/white/00_button_01_ef_press.#.png

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_icon_Hide.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_button_left_ef.png
similarity index 79%
rename from res/common/usr/share/osp/bitmaps/480x800/00_icon_Hide.png
rename to res/common/usr/share/osp/bitmaps/720x1280/white/00_button_left_ef.png
index baba885..48185a6 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_icon_Hide.png and b/res/common/usr/share/osp/bitmaps/720x1280/white/00_button_left_ef.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_button_off.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_button_off.png
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from res/common/usr/share/osp/bitmaps/720x1280/00_button_off.png
rename to res/common/usr/share/osp/bitmaps/720x1280/white/00_button_off.png

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_button_off_dim.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_button_off_dim.png
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from res/common/usr/share/osp/bitmaps/720x1280/00_button_off_dim.png
rename to res/common/usr/share/osp/bitmaps/720x1280/white/00_button_off_dim.png

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_button_on.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_button_on.png
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from res/common/usr/share/osp/bitmaps/720x1280/00_button_on.png
rename to res/common/usr/share/osp/bitmaps/720x1280/white/00_button_on.png

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_button_on_dim.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_button_on_dim.png
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from res/common/usr/share/osp/bitmaps/720x1280/00_button_on_dim.png
rename to res/common/usr/share/osp/bitmaps/720x1280/white/00_button_on_dim.png

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/white/00_button_on_off_handler.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_button_on_off_handler.png
new file mode 100644 (file)
index 0000000..725bb67
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/white/00_button_on_off_handler.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/white/00_button_on_off_handler_dim.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_button_on_off_handler_dim.png
new file mode 100644 (file)
index 0000000..f23fc4a
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/white/00_button_on_off_handler_dim.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_button_right_ef.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_button_right_ef.png
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from res/common/usr/share/osp/bitmaps/720x1280/00_button_right_ef.png
rename to res/common/usr/share/osp/bitmaps/720x1280/white/00_button_right_ef.png

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_circle_bg_ef.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_circle_bg_ef.png
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from res/common/usr/share/osp/bitmaps/720x1280/00_circle_bg_ef.png
rename to res/common/usr/share/osp/bitmaps/720x1280/white/00_circle_bg_ef.png

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_circle_bg_ef_dim.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_circle_bg_ef_dim.png
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from res/common/usr/share/osp/bitmaps/720x1280/00_circle_bg_ef_dim.png
rename to res/common/usr/share/osp/bitmaps/720x1280/white/00_circle_bg_ef_dim.png

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/white/00_circle_bg_ef_press.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_circle_bg_ef_press.png
new file mode 100644 (file)
index 0000000..fea7ec7
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/white/00_circle_bg_ef_press.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/white/00_icon_Back_ef.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_icon_Back_ef.png
new file mode 100644 (file)
index 0000000..905b4f4
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/white/00_icon_Back_ef.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/white/00_icon_Back_ef_02.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_icon_Back_ef_02.png
new file mode 100644 (file)
index 0000000..f26e443
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/white/00_icon_Back_ef_02.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/white/00_icon_SIP_close_ef.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_icon_SIP_close_ef.png
new file mode 100644 (file)
index 0000000..96a3acf
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/white/00_icon_SIP_close_ef.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/white/00_icon_more_ef.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_icon_more_ef.png
new file mode 100644 (file)
index 0000000..5a8f30f
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/white/00_icon_more_ef.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_icon_Hide_trans_ef.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_tab_press_ef.#.png
similarity index 82%
rename from res/common/usr/share/osp/bitmaps/480x800/00_icon_Hide_trans_ef.png
rename to res/common/usr/share/osp/bitmaps/720x1280/white/00_tab_press_ef.#.png
index 464a17d..d475caf 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_icon_Hide_trans_ef.png and b/res/common/usr/share/osp/bitmaps/720x1280/white/00_tab_press_ef.#.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_toolbar_button_ef.#.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_toolbar_button_ef.#.png
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from res/common/usr/share/osp/bitmaps/720x1280/00_toolbar_button_ef.#.png
rename to res/common/usr/share/osp/bitmaps/720x1280/white/00_toolbar_button_ef.#.png

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/white/00_toolbar_button_ef_press.#.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_toolbar_button_ef_press.#.png
new file mode 100644 (file)
index 0000000..34bec54
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/white/00_toolbar_button_ef_press.#.png differ

diff --git a/src/ui/controls/FUiCtrlCheckButton.cpp b/src/ui/controls/FUiCtrlCheckButton.cpp
index f8fc5ce..6f024b2 100644 (file)
--- a/src/ui/controls/FUiCtrlCheckButton.cpp
+++ b/src/ui/controls/FUiCtrlCheckButton.cpp
@@ -23,21 +23,6 @@
 #include <FBaseSysLog.h>
 #include "FUiCtrl_CheckButtonImpl.h"
 
-#define CONTROL_MINIMUM_LENGTH_LIMIT                                   0
-#define CONTROL_MAXIMUM_LENGTH_LIMIT                                   0xFFFF
-#define CONTROL_MINIMUM_SIZE_LIMIT                                             0, 0
-#define CONTROL_MAXIMUM_SIZE_LIMIT                                             0xFFFF, 0xFFFF
-
-#define PROPERTY_CHECKBUTTON_MIN_WIDTH                                 0
-#define PROPERTY_CHECKBUTTON_MIN_HEIGHT                                0
-#define PROPERTY_CHECKBUTTON_MIN_WIDTH_WITH_TITLE              0
-#define PROPERTY_CHECKBUTTON_MIN_HEIGHT_WITH_TITLE      0
-#define PROPERTY_CHECKBUTTON_MIN_WIDTH_WITH_DIVIDER            0
-#define PROPERTY_CHECKBUTTON_MIN_WIDTH_ONOFF_SLIDING    0
-#define PROPERTY_CHECKBUTTON_MIN_WIDTH_WITH_DETAILED    0
-#define PROPERTY_CHECK_MARK_REGION_CONFIG                              108
-int checkMinWidth, checkMinHeight = 0;
-
 using namespace Tizen::Base;
 using namespace Tizen::Graphics;
 
@@ -58,72 +43,25 @@ result
 CheckButton::Construct(const Rectangle& rect, CheckButtonStyle style, BackgroundStyle backgroundStyle,
                                           bool showTitle, const String& text,  GroupStyle groupStyle)
 {
-       switch (style)
-       {
-       case CHECK_BUTTON_STYLE_MARK_WITH_DIVIDER:
-               // fall through
-       case CHECK_BUTTON_STYLE_ONOFF_WITH_DIVIDER:
-               // fall through
-       case CHECK_BUTTON_STYLE_RADIO_WITH_DIVIDER:
-               checkMinWidth = PROPERTY_CHECKBUTTON_MIN_WIDTH_WITH_DIVIDER;
-               break;
-
-       case CHECK_BUTTON_STYLE_MARK_WITH_DETAILED_BUTTON:
-               // fall through
-       case CHECK_BUTTON_STYLE_RADIO_WITH_DETAILED_BUTTON:
-               checkMinWidth = PROPERTY_CHECKBUTTON_MIN_WIDTH_WITH_DETAILED;
-               break;
-
-       case CHECK_BUTTON_STYLE_ONOFF_SLIDING:
-               // fall through
-       case CHECK_BUTTON_STYLE_ONOFF_SLIDING_WITH_DIVIDER:
-               checkMinWidth = PROPERTY_CHECKBUTTON_MIN_WIDTH_ONOFF_SLIDING;
-               break;
-
-       default:     //CHECK_BUTTON_STYLE_MARK , CHECK_BUTTON_STYLE_ONOFF, CHECK_BUTTON_STYLE_RADIO
-               checkMinWidth = showTitle ? PROPERTY_CHECKBUTTON_MIN_WIDTH_WITH_TITLE : PROPERTY_CHECKBUTTON_MIN_WIDTH;
-       }
-
-       checkMinHeight = showTitle ? PROPERTY_CHECKBUTTON_MIN_HEIGHT_WITH_TITLE : PROPERTY_CHECKBUTTON_MIN_HEIGHT;
-
-       SysTryReturn(NID_UI_CTRL, (rect.width >= checkMinWidth && rect.width <= CONTROL_MAXIMUM_LENGTH_LIMIT),
-                       E_INVALID_ARG, E_INVALID_ARG, "[E_INVALID_ARG] The width error occurred");
-
-       SysTryReturn(NID_UI_CTRL, (rect.height >= checkMinHeight && rect.height <= CONTROL_MAXIMUM_LENGTH_LIMIT),
-                       E_INVALID_ARG, E_INVALID_ARG, "[E_INVALID_ARG] The height error occurred");
-
-       SysTryReturn(NID_UI_CTRL, !(backgroundStyle == BACKGROUND_STYLE_NONE && groupStyle != GROUP_STYLE_NONE),
-                       E_INVALID_OPERATION, E_INVALID_OPERATION, "[E_INVALID_OPERATION] Unable to set group style.");
-
        result r = E_SUCCESS;
        _CheckButtonImpl* pCheckButtonImpl = _CheckButtonImpl::GetInstance(*this);
 
        SysAssertf(pCheckButtonImpl == null,
                                "Already constructed. Calling Construct() twice or more on a same instance is not allowed for this class.");
 
+       SysTryReturn(NID_UI_CTRL, !(backgroundStyle == BACKGROUND_STYLE_NONE && groupStyle != GROUP_STYLE_NONE),
+                       E_INVALID_OPERATION, E_INVALID_OPERATION, "[E_INVALID_OPERATION] Unable to set group style.");
+
        pCheckButtonImpl = _CheckButtonImpl::CreateCheckButtonImplN(this, rect);
        r = GetLastResult();
        SysTryReturn(NID_UI_CTRL, pCheckButtonImpl, r, r, "[%s] Propagating.", GetErrorMessage(r));
 
-
-       r = pCheckButtonImpl->SetCheckButtonStyle(style);
-       SysAssert(r == E_SUCCESS); // [ToDo] Exception. Which exception can occur?
-
-       r = pCheckButtonImpl->SetBackgroundStyle(backgroundStyle);
-       SysAssert(r == E_SUCCESS); // [ToDo] Exception. Which exception can occur?
-
-       r = pCheckButtonImpl->SetShowTitle(showTitle);
+       r = pCheckButtonImpl->SetStyle(style, backgroundStyle, showTitle, groupStyle);
        SysAssert(r == E_SUCCESS); // [ToDo] Exception. Which exception can occur?
 
        r = pCheckButtonImpl->SetText(text);
        SysAssert(r == E_SUCCESS); // [ToDo] Exception. Which exception can occur?
 
-       r = pCheckButtonImpl->SetGroupStyle(groupStyle);
-       SysAssert(r == E_SUCCESS); // [ToDo] Exception. Which exception can occur?
-
-       r = pCheckButtonImpl->SetMinimumSize(Dimension(checkMinWidth, checkMinHeight));
-       SysAssert(r == E_SUCCESS); // [ToDo] Exception. Which exception can occur?
-
        _pControlImpl = pCheckButtonImpl;
 
        return E_SUCCESS;
@@ -133,72 +71,25 @@ result
 CheckButton::Construct(const FloatRectangle& rect, CheckButtonStyle style, BackgroundStyle backgroundStyle,
                                           bool showTitle, const String& text,  GroupStyle groupStyle)
 {
-       switch (style)
-       {
-       case CHECK_BUTTON_STYLE_MARK_WITH_DIVIDER:
-               // fall through
-       case CHECK_BUTTON_STYLE_ONOFF_WITH_DIVIDER:
-               // fall through
-       case CHECK_BUTTON_STYLE_RADIO_WITH_DIVIDER:
-               checkMinWidth = PROPERTY_CHECKBUTTON_MIN_WIDTH_WITH_DIVIDER;
-               break;
-
-       case CHECK_BUTTON_STYLE_MARK_WITH_DETAILED_BUTTON:
-               // fall through
-       case CHECK_BUTTON_STYLE_RADIO_WITH_DETAILED_BUTTON:
-               checkMinWidth = PROPERTY_CHECKBUTTON_MIN_WIDTH_WITH_DETAILED;
-               break;
-
-       case CHECK_BUTTON_STYLE_ONOFF_SLIDING:
-               // fall through
-       case CHECK_BUTTON_STYLE_ONOFF_SLIDING_WITH_DIVIDER:
-               checkMinWidth = PROPERTY_CHECKBUTTON_MIN_WIDTH_ONOFF_SLIDING;
-               break;
-
-       default:     //CHECK_BUTTON_STYLE_MARK , CHECK_BUTTON_STYLE_ONOFF, CHECK_BUTTON_STYLE_RADIO
-               checkMinWidth = showTitle ? PROPERTY_CHECKBUTTON_MIN_WIDTH_WITH_TITLE : PROPERTY_CHECKBUTTON_MIN_WIDTH;
-       }
-
-       checkMinHeight = showTitle ? PROPERTY_CHECKBUTTON_MIN_HEIGHT_WITH_TITLE : PROPERTY_CHECKBUTTON_MIN_HEIGHT;
-
-       SysTryReturn(NID_UI_CTRL, (rect.width >= checkMinWidth && rect.width <= CONTROL_MAXIMUM_LENGTH_LIMIT),
-                       E_INVALID_ARG, E_INVALID_ARG, "[E_INVALID_ARG] The width error occurred");
-
-       SysTryReturn(NID_UI_CTRL, (rect.height >= checkMinHeight && rect.height <= CONTROL_MAXIMUM_LENGTH_LIMIT),
-                       E_INVALID_ARG, E_INVALID_ARG, "[E_INVALID_ARG] The height error occurred");
-
-       SysTryReturn(NID_UI_CTRL, !(backgroundStyle == BACKGROUND_STYLE_NONE && groupStyle != GROUP_STYLE_NONE),
-                       E_INVALID_OPERATION, E_INVALID_OPERATION, "[E_INVALID_OPERATION] Unable to set group style.");
-
        result r = E_SUCCESS;
        _CheckButtonImpl* pCheckButtonImpl = _CheckButtonImpl::GetInstance(*this);
 
        SysAssertf(pCheckButtonImpl == null,
                                "Already constructed. Calling Construct() twice or more on a same instance is not allowed for this class.");
 
+       SysTryReturn(NID_UI_CTRL, !(backgroundStyle == BACKGROUND_STYLE_NONE && groupStyle != GROUP_STYLE_NONE),
+                       E_INVALID_OPERATION, E_INVALID_OPERATION, "[E_INVALID_OPERATION] Unable to set group style.");
+
        pCheckButtonImpl = _CheckButtonImpl::CreateCheckButtonImplN(this, rect);
        r = GetLastResult();
        SysTryReturn(NID_UI_CTRL, pCheckButtonImpl, r, r, "[%s] Propagating.", GetErrorMessage(r));
 
-
-       r = pCheckButtonImpl->SetCheckButtonStyle(style);
-       SysAssert(r == E_SUCCESS); // [ToDo] Exception. Which exception can occur?
-
-       r = pCheckButtonImpl->SetBackgroundStyle(backgroundStyle);
-       SysAssert(r == E_SUCCESS); // [ToDo] Exception. Which exception can occur?
-
-       r = pCheckButtonImpl->SetShowTitle(showTitle);
+       r = pCheckButtonImpl->SetStyle(style, backgroundStyle, showTitle, groupStyle);
        SysAssert(r == E_SUCCESS); // [ToDo] Exception. Which exception can occur?
 
        r = pCheckButtonImpl->SetText(text);
        SysAssert(r == E_SUCCESS); // [ToDo] Exception. Which exception can occur?
 
-       r = pCheckButtonImpl->SetGroupStyle(groupStyle);
-       SysAssert(r == E_SUCCESS); // [ToDo] Exception. Which exception can occur?
-
-       r = pCheckButtonImpl->SetMinimumSize(Dimension(checkMinWidth, checkMinHeight));
-       SysAssert(r == E_SUCCESS); // [ToDo] Exception. Which exception can occur?
-
        _pControlImpl = pCheckButtonImpl;
 
        return E_SUCCESS;

diff --git a/src/ui/controls/FUiCtrl_Button.cpp b/src/ui/controls/FUiCtrl_Button.cpp
index 4411b53..b0113d1 100644 (file)
--- a/src/ui/controls/FUiCtrl_Button.cpp
+++ b/src/ui/controls/FUiCtrl_Button.cpp
@@ -53,6 +53,7 @@ _Button::_Button()
        , __prevButtonStatus(_BUTTON_STATUS_NORMAL)
        , __buttonStyle(_BUTTON_STYLE_NORMAL)
        , __textSize(0.0f)
+       , __multilineFontSize(0.0f)
        , __textMaxLine(2)
        , __previousTouchArea(false)
        , __userDefinedText(false)
@@ -67,7 +68,6 @@ _Button::_Button()
        , __drawInner(false)
        , __userDefinedTextArea(0.0f, 0.0f, 0.0f, 0.0f)
        , __pTextElement(null)
-       , __multilineFontSize(0.0f)
        , __isSettingMultilineFontSize(false)
 {
        result r = E_SUCCESS;

diff --git a/src/ui/controls/FUiCtrl_CheckButtonImpl.cpp b/src/ui/controls/FUiCtrl_CheckButtonImpl.cpp
index d020997..28c733b 100644 (file)
--- a/src/ui/controls/FUiCtrl_CheckButtonImpl.cpp
+++ b/src/ui/controls/FUiCtrl_CheckButtonImpl.cpp
@@ -527,36 +527,18 @@ _CheckButtonImpl::GetColor(CheckButtonStatus status) const
 }
 
 result
-_CheckButtonImpl::SetCheckButtonStyle(const CheckButtonStyle& checkButtonStyle)
+_CheckButtonImpl::SetStyle(const CheckButtonStyle& checkButtonStyle, const BackgroundStyle& backgroundStyle, bool showTitle, const GroupStyle& groupStyle)
 {
        result r = GetCore().SetCheckButtonStyle(checkButtonStyle);
        SysTryLog(NID_UI_CTRL, r == E_SUCCESS, "[%s] Propagating.", GetErrorMessage(r));
 
-       return r;
-}
-
-result
-_CheckButtonImpl::SetBackgroundStyle(const BackgroundStyle& backgroundStyle)
-{
-       result r = GetCore().SetBackgroundStyle(backgroundStyle);
+       r = GetCore().SetBackgroundStyle(backgroundStyle);
        SysTryLog(NID_UI_CTRL, r == E_SUCCESS, "[%s] Propagating.", GetErrorMessage(r));
 
-       return r;
-}
-
-result
-_CheckButtonImpl::SetShowTitle(bool showTitle)
-{
-       result r = GetCore().SetShowTitle(showTitle);
+       r = GetCore().SetShowTitle(showTitle);
        SysTryLog(NID_UI_CTRL, r == E_SUCCESS, "[%s] Propagating.", GetErrorMessage(r));
 
-       return r;
-}
-
-result
-_CheckButtonImpl::SetGroupStyle(const GroupStyle& groupStyle)
-{
-       result r = GetCore().SetGroupStyle(groupStyle);
+       r = GetCore().SetGroupStyle(groupStyle);
        SysTryLog(NID_UI_CTRL, r == E_SUCCESS, "[%s] Propagating.", GetErrorMessage(r));
 
        return r;

diff --git a/src/ui/controls/FUiCtrl_LabelPresenter.cpp b/src/ui/controls/FUiCtrl_LabelPresenter.cpp
index 04e46f0..08ca078 100644 (file)
--- a/src/ui/controls/FUiCtrl_LabelPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_LabelPresenter.cpp
@@ -158,41 +158,13 @@ _LabelPresenter::OnFontChanged(Font* pFont)
        return;
 }
 
-#if 0
 result
 _LabelPresenter::SetTextConfig(int size, LabelTextStyle style)
 {
-       result r = E_SUCCESS;
-
-       unsigned long fontStyle = FONT_STYLE_PLAIN;
-       bool isStrikeOut = __pFont->IsStrikeOut();
-       bool isUnderLine = __pFont->IsUnderlined();
-
-       __textStyle = style;
-
-       if (__textStyle == LABEL_TEXT_STYLE_ITALIC)
-       {
-               fontStyle |= FONT_STYLE_ITALIC;
-       }
-
-       if (__textStyle == LABEL_TEXT_STYLE_BOLD)
-       {
-               fontStyle |= FONT_STYLE_BOLD;
-       }
+       float floatSize = _CoordinateSystemUtils::ConvertToFloat(size);
 
-       __fontStyle = fontStyle;
-       __fontSize = size;
-
-       __pFont = __pLabel->GetFallbackFont();
-       r = GetLastResult();
-       SysTryReturn(NID_UI_CTRL, __pFont, r, r, "[%s] Propagating.", GetErrorMessage(r));
-
-       __pFont->SetStrikeOut(isStrikeOut);
-       __pFont->SetUnderline(isUnderLine);
-
-       return E_SUCCESS;
+       return SetTextConfig(floatSize, style);
 }
-#endif
 
 result
 _LabelPresenter::SetTextConfig(float size, LabelTextStyle style)
@@ -235,6 +207,14 @@ _LabelPresenter::GetTextStyle(void) const
 }
 
 void
+_LabelPresenter::SetFontInfo(unsigned long style, int size)
+{
+       float floatSize = _CoordinateSystemUtils::ConvertToFloat(size);
+
+       return SetFontInfo(style, floatSize);
+}
+
+void
 _LabelPresenter::SetFontInfo(unsigned long style, float size)
 {
        __fontStyle = style;

diff --git a/src/ui/controls/FUiCtrl_Toolbar.cpp b/src/ui/controls/FUiCtrl_Toolbar.cpp
index c290794..61d3863 100644 (file)
--- a/src/ui/controls/FUiCtrl_Toolbar.cpp
+++ b/src/ui/controls/FUiCtrl_Toolbar.cpp
@@ -3208,7 +3208,8 @@ _Toolbar::ApplyUserGUI(ButtonType buttonType, _Button* pButton)
                                GET_BITMAP_CONFIG_N(FOOTER::BUTTON_ITEM_BG_EFFECT_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pPressedBackgroundEffectBitmap);
                        }
                }
-               else if (__style == TOOLBAR_HEADER_SEGMENTED || __style == TOOLBAR_HEADER_SEGMENTED_WITH_TITLE || __style == TOOLBAR_TAB || __style == TOOLBAR_TAB_WITH_TITLE)
+               else if (__style == TOOLBAR_HEADER_SEGMENTED || __style == TOOLBAR_HEADER_SEGMENTED_WITH_TITLE || __style == TOOLBAR_SEGMENTED
+                               || __style == TOOLBAR_TAB || __style == TOOLBAR_TAB_WITH_TITLE)
                {
                        GET_BITMAP_CONFIG_N(HEADER::BUTTON_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pNormalBackgroundBitmap);
                        GET_BITMAP_CONFIG_N(HEADER::TAB_ITEM_BG_EFFECT_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pPressedBackgroundBitmap);
@@ -4752,11 +4753,11 @@ _Toolbar::RearrangeButtonItems(void)
                                        && __pItems.at(0)->GetBitmap(_BUTTON_STATUS_SELECTED) == null
                                        && __pItems.at(0)->GetBitmap(_BUTTON_STATUS_HIGHLIGHTED) == null)) // at least 1 bitmap
                        {
-                               blockWidth[0] = __pItems.at(0)->GetTextExtentSize() + iconSizeWithText + sideMargin * 3;
+                               blockWidth[0] = __pItems.at(0)->GetTextExtentSizeF() + iconSizeWithText + sideMargin * 3;
                        }
                        else
                        {
-                               blockWidth[0] = __pItems.at(0)->GetTextExtentSize() + sideMargin * 2;
+                               blockWidth[0] = __pItems.at(0)->GetTextExtentSizeF() + sideMargin * 2;
                        }
 
                        if (blockWidth[0] > maxItemLength)
@@ -4807,11 +4808,11 @@ _Toolbar::RearrangeButtonItems(void)
                                && __pItems.at(0)->GetBitmap(_BUTTON_STATUS_SELECTED) == null
                                && __pItems.at(0)->GetBitmap(_BUTTON_STATUS_HIGHLIGHTED) == null)) // at least 1 bitmap
                {
-                       blockWidth[0] = __pItems.at(0)->GetTextExtentSize() + iconSizeWithText + sideMargin * 3;
+                       blockWidth[0] = __pItems.at(0)->GetTextExtentSizeF() + iconSizeWithText + sideMargin * 3;
                }
                else
                {
-                       blockWidth[0] = __pItems.at(0)->GetTextExtentSize() + sideMargin * 2;
+                       blockWidth[0] = __pItems.at(0)->GetTextExtentSizeF() + sideMargin * 2;
                }
 
                if (blockWidth[0] > maxItemLength)
@@ -4829,11 +4830,11 @@ _Toolbar::RearrangeButtonItems(void)
                                && __pItems.at(1)->GetBitmap(_BUTTON_STATUS_SELECTED) == null
                                && __pItems.at(1)->GetBitmap(_BUTTON_STATUS_HIGHLIGHTED) == null)) // at least 1 bitmap
                {
-                       blockWidth[1] = __pItems.at(1)->GetTextExtentSize() + iconSizeWithText + sideMargin * 3;
+                       blockWidth[1] = __pItems.at(1)->GetTextExtentSizeF() + iconSizeWithText + sideMargin * 3;
                }
                else
                {
-                       blockWidth[1] = __pItems.at(1)->GetTextExtentSize() + sideMargin * 2;
+                       blockWidth[1] = __pItems.at(1)->GetTextExtentSizeF() + sideMargin * 2;
                }
 
                if (blockWidth[1] > maxItemLength)
@@ -5692,7 +5693,8 @@ _Toolbar::SetPropertyPressedItemColor(const Variant& color)
        {
                GET_BITMAP_CONFIG_N(FOOTER::BUTTON_ITEM_BG_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, __pBaseBackgroundBitmap);
        }
-       else if (__style == TOOLBAR_HEADER_SEGMENTED || __style == TOOLBAR_HEADER_SEGMENTED_WITH_TITLE || __style == TOOLBAR_TAB || __style == TOOLBAR_TAB_WITH_TITLE)
+       else if (__style == TOOLBAR_HEADER_SEGMENTED || __style == TOOLBAR_HEADER_SEGMENTED_WITH_TITLE || __style == TOOLBAR_SEGMENTED
+                       || __style == TOOLBAR_TAB || __style == TOOLBAR_TAB_WITH_TITLE)
        {
                GET_BITMAP_CONFIG_N(HEADER::TAB_ITEM_BG_EFFECT_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, __pBaseBackgroundBitmap);
        }
@@ -5980,6 +5982,8 @@ _Toolbar::SetHideButton(bool hideButton)
 
        GET_SHAPE_CONFIG(FOOTER::BUTTON_ITEM_ICON_SIZE, GetOrientation(), iconSize);
 
+       _AccessibilityElement* pBackButtonElement = __pButtonItems[BACK_BUTTON]->GetAccessibilityContainer()->GetChildElement(0);
+
        if (hideButton)
        {
                GET_BITMAP_CONFIG_N(FOOTER::HIDE_ICON_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pIconNormalBitmap);
@@ -5988,6 +5992,12 @@ _Toolbar::SetHideButton(bool hideButton)
                {
                        GET_BITMAP_CONFIG_N(FOOTER::HIDE_ICON_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pIconNormalEffectBitmap);
                }
+
+               if (pBackButtonElement)
+               {
+                       pBackButtonElement->SetLabel("Hide");
+                       pBackButtonElement->SetTrait("Hide Button");
+               }
        }
        else
        {
@@ -5997,6 +6007,12 @@ _Toolbar::SetHideButton(bool hideButton)
                {
                        GET_BITMAP_CONFIG_N(FOOTER::BACK_ICON_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pIconNormalEffectBitmap);
                }
+
+               if (pBackButtonElement)
+               {
+                       pBackButtonElement->SetLabel("Back");
+                       pBackButtonElement->SetTrait("Back Button");
+               }
        }
 
        if (pIconNormalBitmap)

diff --git a/src/ui/inc/FUiCtrl_CheckButtonImpl.h b/src/ui/inc/FUiCtrl_CheckButtonImpl.h
index 1cbab57..bd9d3e4 100644 (file)
--- a/src/ui/inc/FUiCtrl_CheckButtonImpl.h
+++ b/src/ui/inc/FUiCtrl_CheckButtonImpl.h
@@ -103,10 +103,7 @@ public:
        result SetColor(CheckButtonStatus status, const Tizen::Graphics::Color& color);
        Tizen::Graphics::Color GetColor(CheckButtonStatus status) const;
 
-       result SetCheckButtonStyle(const CheckButtonStyle& checkButtonStyle);
-       result SetBackgroundStyle(const BackgroundStyle& backgroundStyle);
-       result SetShowTitle(bool showTitle);
-       result SetGroupStyle(const GroupStyle& groupStyle);
+       result SetStyle(const CheckButtonStyle& checkButtonStyle, const BackgroundStyle& backgroundStyle, bool showTitle, const GroupStyle& groupStyle);
 
        virtual void OnActionPerformed(const Tizen::Ui::_Control& source, int actionId);
        virtual bool IsLayoutable(void) const;

diff --git a/src/ui/inc/FUiCtrl_LabelPresenter.h b/src/ui/inc/FUiCtrl_LabelPresenter.h
index 85150a5..cf332b0 100644 (file)
--- a/src/ui/inc/FUiCtrl_LabelPresenter.h
+++ b/src/ui/inc/FUiCtrl_LabelPresenter.h
@@ -63,8 +63,9 @@ public:
        void OnFontChanged(Tizen::Graphics::Font* pFont);
        void OnFontInfoRequested(unsigned long& style, int& size);
        void OnFontInfoRequested(unsigned long& style, float& size);
+       void SetFontInfo(unsigned long style, int size);
        void SetFontInfo(unsigned long style, float size);
-       //result SetTextConfig(int size, LabelTextStyle style);
+       result SetTextConfig(int size, LabelTextStyle style);
        result SetTextConfig(float size, LabelTextStyle style);
        LabelTextStyle GetTextStyle(void) const;
 

diff --git a/src/ui/resource/FUi_ResourceButtonConfig.cpp b/src/ui/resource/FUi_ResourceButtonConfig.cpp
index 4c600eb..5ddd87f 100644 (file)
--- a/src/ui/resource/FUi_ResourceButtonConfig.cpp
+++ b/src/ui/resource/FUi_ResourceButtonConfig.cpp
@@ -33,15 +33,15 @@ START_UI_CONFIG(BUTTON);
        ADD_COLOR_CONFIG(TEXT_PRESSED, $F031L1P);
        ADD_COLOR_CONFIG(TEXT_HIGHLIGHTED, $F031L1P);
 
-       ADD_IMAGE_CONFIG(BG_NORMAL, #00_button_02.#.png);
-       ADD_IMAGE_CONFIG(BG_DISABLED, #00_button_02.#.png);
-       ADD_IMAGE_CONFIG(BG_PRESSED, #00_button_02.#.png);
-       ADD_IMAGE_CONFIG(BG_HIGHLIGHTED, #00_button_02.#.png);
+       ADD_IMAGE_CONFIG(BG_NORMAL, #00_button_01.#.png);
+       ADD_IMAGE_CONFIG(BG_DISABLED, #00_button_01.#.png);
+       ADD_IMAGE_CONFIG(BG_PRESSED, #00_button_01.#.png);
+       ADD_IMAGE_CONFIG(BG_HIGHLIGHTED, #00_button_01.#.png);
 
-       ADD_IMAGE_CONFIG(BG_EFFECT_NORMAL, #00_button_02_ef.#.png);
-       ADD_IMAGE_CONFIG(BG_EFFECT_DISABLED, #00_button_03_dim_ef.#.png);
-       ADD_IMAGE_CONFIG(BG_EFFECT_PRESSED, #00_button_02_ef_press.#.png);
-       ADD_IMAGE_CONFIG(BG_EFFECT_HIGHLIGHTED, #00_button_02_ef_press.#.png);
+       ADD_IMAGE_CONFIG(BG_EFFECT_NORMAL, #00_button_01_ef.#.png);
+       ADD_IMAGE_CONFIG(BG_EFFECT_DISABLED, #00_button_01_ef_dim.#.png);
+       ADD_IMAGE_CONFIG(BG_EFFECT_PRESSED, #00_button_01_ef_press.#.png);
+       ADD_IMAGE_CONFIG(BG_EFFECT_HIGHLIGHTED, #00_button_01_ef_press.#.png);
 
        START_UI_CONFIG_MODE(480x800);
                ADD_DIMENSION_CONFIG(MIN_SIZE, 0, 0);

diff --git a/src/ui/resource/FUi_ResourceFooterConfig.cpp b/src/ui/resource/FUi_ResourceFooterConfig.cpp
index ef604e4..dd88888 100644 (file)
--- a/src/ui/resource/FUi_ResourceFooterConfig.cpp
+++ b/src/ui/resource/FUi_ResourceFooterConfig.cpp
@@ -171,19 +171,13 @@ START_UI_CONFIG(FOOTER);
        ADD_IMAGE_CONFIG(BACK_ICON_TRANSLUCENT_EFFECT_NORMAL, #00_icon_Back_trans_ef.png); //not supported by theme
        ADD_IMAGE_CONFIG(BACK_ICON_TRANSLUCENT_EFFECT_PRESSED, #00_icon_Back_trans_ef.png); //not supported by theme
 
-       ADD_IMAGE_CONFIG(HIDE_ICON_NORMAL, #00_icon_Hide.png);
-       ADD_IMAGE_CONFIG(HIDE_ICON_DISABLED, #00_icon_Hide.png);
-       ADD_IMAGE_CONFIG(HIDE_ICON_PRESSED, #00_icon_Hide.png);
-       ADD_IMAGE_CONFIG(HIDE_ICON_HIGHLIGHTED, #00_icon_Hide.png);
+       ADD_IMAGE_CONFIG(HIDE_ICON_NORMAL, #00_icon_SIP_close.png);
+       ADD_IMAGE_CONFIG(HIDE_ICON_DISABLED, #00_icon_SIP_close.png);
+       ADD_IMAGE_CONFIG(HIDE_ICON_PRESSED, #00_icon_SIP_close.png);
+       ADD_IMAGE_CONFIG(HIDE_ICON_HIGHLIGHTED, #00_icon_SIP_close.png);
 
-       ADD_IMAGE_CONFIG(HIDE_ICON_EFFECT_NORMAL, #00_icon_Hide_ef.png); //not supported by theme
-       ADD_IMAGE_CONFIG(HIDE_ICON_EFFECT_PRESSED, #00_icon_Hide_ef.png); //not supported by theme
-
-       ADD_IMAGE_CONFIG(HIDE_ICON_EFFECT_NORMAL2, #00_icon_Hide_ef_02.png); //not supported by theme
-       ADD_IMAGE_CONFIG(HIDE_ICON_EFFECT_PRESSED2, #00_icon_Hide_ef_02.png); //not supported by theme
-
-       ADD_IMAGE_CONFIG(HIDE_ICON_TRANSLUCENT_EFFECT_NORMAL, #00_icon_Hide_trans_ef.png); //not supported by theme
-       ADD_IMAGE_CONFIG(HIDE_ICON_TRANSLUCENT_EFFECT_PRESSED, #00_icon_Hide_trans_ef.png); //not supported by theme
+       ADD_IMAGE_CONFIG(HIDE_ICON_EFFECT_NORMAL, #00_icon_SIP_close_ef.png); //not supported by theme
+       ADD_IMAGE_CONFIG(HIDE_ICON_EFFECT_PRESSED, #00_icon_SIP_close_ef.png); //not supported by theme
 
        ADD_IMAGE_CONFIG(MORE_ICON_NORMAL, #00_icon_more.png);
        ADD_IMAGE_CONFIG(MORE_ICON_DISABLED, #00_icon_more.png);