Resolved the merge conflict.
authorRajeev Ranjan <rajeev.r@samsung.com>
Thu, 31 Mar 2011 09:32:25 +0000 (15:02 +0530)
committerRajeev Ranjan <rajeev.r@samsung.com>
Thu, 31 Mar 2011 09:32:25 +0000 (15:02 +0530)
commit445749e0c7a41cd00c402ed7756ebb78ccf94876
tree6a3a6ff0d77e459afda70d320a2b115e0472a755
parent075ce1ac0adbeec21baf059957361ae9e94a5eb1
Resolved the merge conflict.
Corrected the button for pressed state of reveal/extended style of button
Fixed the review comments raised in earlier commits.
Updated Button, Radio and Check for NBEAT ver-1.0

Change-Id: Ibd75c9cf9cc8dd5b197c335a987e71108a61f547
61 files changed:
themes/groups/button.edc
themes/groups/check.edc
themes/groups/radio.edc
themes/images/nbeat-black/00_btn_circle_bg_normal.png [new file with mode: 0644]
themes/images/nbeat-black/00_btn_circle_bg_press.png [new file with mode: 0644]
themes/images/nbeat-black/00_button_call.png
themes/images/nbeat-black/00_button_call_press.png
themes/images/nbeat-black/00_button_cancel.png [new file with mode: 0644]
themes/images/nbeat-black/00_button_cancel_press.png [new file with mode: 0644]
themes/images/nbeat-black/00_button_expand_closed.png
themes/images/nbeat-black/00_button_expand_closed_press.png
themes/images/nbeat-black/00_button_expand_opened.png
themes/images/nbeat-black/00_button_expand_opened_press.png
themes/images/nbeat-black/00_button_info.png
themes/images/nbeat-black/00_button_info_press.png
themes/images/nbeat-black/00_button_minus.png [new file with mode: 0644]
themes/images/nbeat-black/00_button_minus_press.png [new file with mode: 0644]
themes/images/nbeat-black/00_button_plus.png [new file with mode: 0644]
themes/images/nbeat-black/00_button_plus_press.png [new file with mode: 0644]
themes/images/nbeat-black/00_button_radio_normal1.png [new file with mode: 0644]
themes/images/nbeat-black/00_button_radio_normal2.png [new file with mode: 0644]
themes/images/nbeat-black/00_button_radio_press1.png [new file with mode: 0644]
themes/images/nbeat-black/00_button_radio_press2.png [new file with mode: 0644]
themes/images/nbeat-black/00_button_rename.png
themes/images/nbeat-black/00_button_rename_press.png
themes/images/nbeat-black/00_button_reveal.png
themes/images/nbeat-black/00_button_reveal_press.png
themes/images/nbeat-black/00_button_send.png [new file with mode: 0644]
themes/images/nbeat-black/00_button_send_press.png [new file with mode: 0644]
themes/images/nbeat-black/00_button_warning.png
themes/images/nbeat-black/00_button_warning_press.png
themes/images/nbeat-black/00_check_bg_press.png
themes/images/nbeat/00_btn_circle_bg_normal.png [new file with mode: 0644]
themes/images/nbeat/00_btn_circle_bg_press.png [new file with mode: 0644]
themes/images/nbeat/00_button_call.png
themes/images/nbeat/00_button_call_press.png
themes/images/nbeat/00_button_cancel.png [new file with mode: 0644]
themes/images/nbeat/00_button_cancel_press.png [new file with mode: 0644]
themes/images/nbeat/00_button_expand_closed.png [changed mode: 0755->0644]
themes/images/nbeat/00_button_expand_closed_press.png [changed mode: 0755->0644]
themes/images/nbeat/00_button_expand_opened.png [changed mode: 0755->0644]
themes/images/nbeat/00_button_expand_opened_press.png [changed mode: 0755->0644]
themes/images/nbeat/00_button_info.png
themes/images/nbeat/00_button_info_press.png
themes/images/nbeat/00_button_minus.png [new file with mode: 0644]
themes/images/nbeat/00_button_minus_press.png [new file with mode: 0644]
themes/images/nbeat/00_button_plus.png [new file with mode: 0644]
themes/images/nbeat/00_button_plus_press.png [new file with mode: 0644]
themes/images/nbeat/00_button_radio_normal1.png [new file with mode: 0644]
themes/images/nbeat/00_button_radio_normal2.png [new file with mode: 0644]
themes/images/nbeat/00_button_radio_press1.png [new file with mode: 0644]
themes/images/nbeat/00_button_radio_press2.png [new file with mode: 0644]
themes/images/nbeat/00_button_rename.png
themes/images/nbeat/00_button_rename_press.png
themes/images/nbeat/00_button_reveal.png
themes/images/nbeat/00_button_reveal_press.png
themes/images/nbeat/00_button_send.png [new file with mode: 0644]
themes/images/nbeat/00_button_send_press.png [new file with mode: 0644]
themes/images/nbeat/00_button_warning.png
themes/images/nbeat/00_button_warning_press.png
themes/images/nbeat/00_check_bg_press.png