eclair snapshot tegra-9.12.5 tegra-9.12.5-baseline tegra-9.12.6 tegra-9.12.6-baseline
Jean-Baptiste Queru [Fri, 13 Nov 2009 02:46:11 +0000 (18:46 -0800)]
476 files changed:
AndroidManifest.xml
res/color-finger/dialer_button_text.xml
res/color-finger/ota_title_color.xml [new file with mode: 0644]
res/drawable-finger/btn_dial.xml
res/drawable-finger/btn_dial_action.xml [new file with mode: 0644]
res/drawable-finger/btn_dial_blue.xml [moved from res/drawable-finger/dial_num_1.xml with 57% similarity]
res/drawable-finger/btn_dial_delete.xml
res/drawable-finger/btn_dial_delete_activated.9.png [deleted file]
res/drawable-finger/btn_dial_delete_normal.9.png [deleted file]
res/drawable-finger/btn_dial_delete_pressed.9.png [deleted file]
res/drawable-finger/btn_dial_delete_selected.9.png [deleted file]
res/drawable-finger/btn_dial_green.xml [moved from res/drawable-finger/btn_dial_delete_active.xml with 58% similarity]
res/drawable-finger/btn_dial_normal.png [deleted file]
res/drawable-finger/btn_dial_pressed.png [deleted file]
res/drawable-finger/btn_dial_selected.png [deleted file]
res/drawable-finger/btn_dial_textfield_activated.9.png [deleted file]
res/drawable-finger/btn_dial_textfield_normal.9.png [deleted file]
res/drawable-finger/btn_dial_textfield_pressed.9.png [deleted file]
res/drawable-finger/btn_dial_textfield_selected.9.png [deleted file]
res/drawable-finger/btn_dialer_default.png [deleted file]
res/drawable-finger/btn_dialer_pressed.9.png [deleted file]
res/drawable-finger/btn_dialer_selected.9.png [deleted file]
res/drawable-finger/dial_num_0_wht.png [deleted file]
res/drawable-finger/dial_num_1_no_vm_blk.png [deleted file]
res/drawable-finger/dial_num_1_no_vm_wht.png [deleted file]
res/drawable-finger/dial_num_1_wht.png [deleted file]
res/drawable-finger/dial_num_2_blk.png [deleted file]
res/drawable-finger/dial_num_2_wht.png [deleted file]
res/drawable-finger/dial_num_3_blk.png [deleted file]
res/drawable-finger/dial_num_3_wht.png [deleted file]
res/drawable-finger/dial_num_4_blk.png [deleted file]
res/drawable-finger/dial_num_4_wht.png [deleted file]
res/drawable-finger/dial_num_5_blk.png [deleted file]
res/drawable-finger/dial_num_5_wht.png [deleted file]
res/drawable-finger/dial_num_6_blk.png [deleted file]
res/drawable-finger/dial_num_6_wht.png [deleted file]
res/drawable-finger/dial_num_7_blk.png [deleted file]
res/drawable-finger/dial_num_7_wht.png [deleted file]
res/drawable-finger/dial_num_8_blk.png [deleted file]
res/drawable-finger/dial_num_8_wht.png [deleted file]
res/drawable-finger/dial_num_9_blk.png [deleted file]
res/drawable-finger/dial_num_9_wht.png [deleted file]
res/drawable-finger/dial_num_pound_blk.png [deleted file]
res/drawable-finger/dial_num_pound_wht.png [deleted file]
res/drawable-finger/dial_num_star_blk.png [deleted file]
res/drawable-finger/dial_num_star_wht.png [deleted file]
res/drawable-finger/ic_delete_phone_number.xml [deleted file]
res/drawable-finger/ic_delete_phone_number_blk.png [deleted file]
res/drawable-finger/ic_delete_phone_number_wht.png [deleted file]
res/drawable-hdpi-finger/btn_dial_action_left_disable.9.png [new file with mode: 0644]
res/drawable-hdpi-finger/btn_dial_action_left_disable_focused.9.png [new file with mode: 0644]
res/drawable-hdpi-finger/btn_dial_action_left_normal.9.png [new file with mode: 0644]
res/drawable-hdpi-finger/btn_dial_action_left_pressed.9.png [new file with mode: 0644]
res/drawable-hdpi-finger/btn_dial_action_left_selected.9.png [new file with mode: 0644]
res/drawable-hdpi-finger/btn_dial_action_middle_disable.9.png [new file with mode: 0644]
res/drawable-hdpi-finger/btn_dial_action_middle_disable_focused.9.png [new file with mode: 0644]
res/drawable-hdpi-finger/btn_dial_action_middle_normal.9.png [new file with mode: 0644]
res/drawable-hdpi-finger/btn_dial_action_middle_pressed.9.png [new file with mode: 0644]
res/drawable-hdpi-finger/btn_dial_action_middle_selected.9.png [new file with mode: 0644]
res/drawable-hdpi-finger/btn_dial_action_right_disable.9.png [new file with mode: 0644]
res/drawable-hdpi-finger/btn_dial_action_right_disable_focused.9.png [new file with mode: 0644]
res/drawable-hdpi-finger/btn_dial_action_right_normal.9.png [new file with mode: 0644]
res/drawable-hdpi-finger/btn_dial_action_right_pressed.9.png [new file with mode: 0644]
res/drawable-hdpi-finger/btn_dial_action_right_selected.9.png [new file with mode: 0644]
res/drawable-hdpi-finger/btn_dial_normal.9.png [new file with mode: 0644]
res/drawable-hdpi-finger/btn_dial_normal_blue.9.png [new file with mode: 0644]
res/drawable-hdpi-finger/btn_dial_normal_green.9.png [new file with mode: 0644]
res/drawable-hdpi-finger/btn_dial_pressed.9.png [new file with mode: 0644]
res/drawable-hdpi-finger/btn_dial_selected.9.png [new file with mode: 0644]
res/drawable-hdpi-finger/btn_dial_textfield_activated.9.png [new file with mode: 0644]
res/drawable-hdpi-finger/btn_dial_textfield_normal.9.png [new file with mode: 0644]
res/drawable-hdpi-finger/btn_dial_textfield_normal_full.9.png [new file with mode: 0644]
res/drawable-hdpi-finger/btn_dial_textfield_normal_full_sm.9.png [new file with mode: 0644]
res/drawable-hdpi-finger/btn_dial_textfield_pressed.9.png [new file with mode: 0644]
res/drawable-hdpi-finger/btn_dial_textfield_selected.9.png [new file with mode: 0644]
res/drawable-hdpi-finger/dial_num_0_blk.png [new file with mode: 0644]
res/drawable-hdpi-finger/dial_num_0_wht.png [new file with mode: 0644]
res/drawable-hdpi-finger/dial_num_1_no_vm_blk.png [new file with mode: 0644]
res/drawable-hdpi-finger/dial_num_1_no_vm_wht.png [new file with mode: 0644]
res/drawable-hdpi-finger/dial_num_2_blk.png [new file with mode: 0644]
res/drawable-hdpi-finger/dial_num_2_wht.png [new file with mode: 0644]
res/drawable-hdpi-finger/dial_num_3_blk.png [new file with mode: 0644]
res/drawable-hdpi-finger/dial_num_3_wht.png [new file with mode: 0644]
res/drawable-hdpi-finger/dial_num_4_blk.png [new file with mode: 0644]
res/drawable-hdpi-finger/dial_num_4_wht.png [new file with mode: 0644]
res/drawable-hdpi-finger/dial_num_5_blk.png [new file with mode: 0644]
res/drawable-hdpi-finger/dial_num_5_wht.png [new file with mode: 0644]
res/drawable-hdpi-finger/dial_num_6_blk.png [new file with mode: 0644]
res/drawable-hdpi-finger/dial_num_6_wht.png [new file with mode: 0644]
res/drawable-hdpi-finger/dial_num_7_blk.png [new file with mode: 0644]
res/drawable-hdpi-finger/dial_num_7_wht.png [new file with mode: 0644]
res/drawable-hdpi-finger/dial_num_8_blk.png [new file with mode: 0644]
res/drawable-hdpi-finger/dial_num_8_wht.png [new file with mode: 0644]
res/drawable-hdpi-finger/dial_num_9_blk.png [new file with mode: 0644]
res/drawable-hdpi-finger/dial_num_9_wht.png [new file with mode: 0644]
res/drawable-hdpi-finger/dial_num_pound_blk.png [new file with mode: 0644]
res/drawable-hdpi-finger/dial_num_pound_wht.png [new file with mode: 0644]
res/drawable-hdpi-finger/dial_num_star_blk.png [new file with mode: 0644]
res/drawable-hdpi-finger/dial_num_star_wht.png [new file with mode: 0644]
res/drawable-hdpi-finger/ic_dial_action_call.png [new file with mode: 0644]
res/drawable-hdpi-finger/ic_dial_action_delete.png [new file with mode: 0644]
res/drawable-hdpi-finger/ic_dial_action_voice_mail.png [new file with mode: 0644]
res/drawable-hdpi-finger/ic_dial_number_blk.png [new file with mode: 0644]
res/drawable-hdpi-finger/ic_dial_number_wht.png [new file with mode: 0644]
res/drawable-hdpi-finger/ic_menu_contact.png [new file with mode: 0644]
res/drawable-hdpi-finger/ic_tab_selected_contacts.png [new file with mode: 0644]
res/drawable-hdpi-finger/ic_tab_selected_dialer.png [new file with mode: 0644]
res/drawable-hdpi-finger/ic_tab_selected_recent.png [new file with mode: 0644]
res/drawable-hdpi-finger/ic_tab_selected_stared.png [new file with mode: 0644]
res/drawable-hdpi-finger/ic_tab_unselected_contacts.png [new file with mode: 0644]
res/drawable-hdpi-finger/ic_tab_unselected_dialer.png [new file with mode: 0644]
res/drawable-hdpi-finger/ic_tab_unselected_recent.png [new file with mode: 0644]
res/drawable-hdpi-finger/ic_tab_unselected_stared.png [new file with mode: 0644]
res/drawable-hdpi/bg_in_call_gradient_bluetooth.9.png [new file with mode: 0755]
res/drawable-hdpi/bg_in_call_gradient_connected.9.png [new file with mode: 0755]
res/drawable-hdpi/bg_in_call_gradient_ended.9.png [new file with mode: 0755]
res/drawable-hdpi/bg_in_call_gradient_on_hold.9.png [new file with mode: 0755]
res/drawable-hdpi/bg_in_call_gradient_unidentified.9.png [new file with mode: 0755]
res/drawable-hdpi/btn_in_call_answer_dotted_green.9.png [new file with mode: 0755]
res/drawable-hdpi/btn_in_call_answer_dotted_red.9.png [new file with mode: 0755]
res/drawable-hdpi/btn_in_call_answer_normal.9.png [new file with mode: 0755]
res/drawable-hdpi/btn_in_call_answer_pressed.9.png [new file with mode: 0755]
res/drawable-hdpi/btn_in_call_main_disable.9.png [new file with mode: 0755]
res/drawable-hdpi/btn_in_call_main_disable_focused.9.png [new file with mode: 0755]
res/drawable-hdpi/btn_in_call_main_normal.9.png [new file with mode: 0755]
res/drawable-hdpi/btn_in_call_main_pressed.9.png [new file with mode: 0755]
res/drawable-hdpi/btn_in_call_main_selected.9.png [new file with mode: 0755]
res/drawable-hdpi/btn_in_call_manage_conf_normal.9.png [new file with mode: 0755]
res/drawable-hdpi/btn_in_call_manage_conf_pressed.9.png [new file with mode: 0755]
res/drawable-hdpi/btn_in_call_manage_conf_selected.9.png [new file with mode: 0755]
res/drawable-hdpi/btn_in_call_round_disable.png [new file with mode: 0755]
res/drawable-hdpi/btn_in_call_round_disable_focused.png [new file with mode: 0755]
res/drawable-hdpi/btn_in_call_round_normal.png [new file with mode: 0755]
res/drawable-hdpi/btn_in_call_round_pressed.png [new file with mode: 0755]
res/drawable-hdpi/btn_in_call_round_selected.png [new file with mode: 0755]
res/drawable-hdpi/btn_in_call_switch_off_disable.9.png [new file with mode: 0755]
res/drawable-hdpi/btn_in_call_switch_off_disable_focused.9.png [new file with mode: 0755]
res/drawable-hdpi/btn_in_call_switch_off_normal.9.png [new file with mode: 0755]
res/drawable-hdpi/btn_in_call_switch_off_pressed.9.png [new file with mode: 0755]
res/drawable-hdpi/btn_in_call_switch_off_selected.9.png [new file with mode: 0755]
res/drawable-hdpi/btn_in_call_switch_on_disable.9.png [new file with mode: 0755]
res/drawable-hdpi/btn_in_call_switch_on_disable_focused.9.png [new file with mode: 0755]
res/drawable-hdpi/btn_in_call_switch_on_normal.9.png [new file with mode: 0755]
res/drawable-hdpi/btn_in_call_switch_on_pressed.9.png [new file with mode: 0755]
res/drawable-hdpi/btn_in_call_switch_on_selected.9.png [new file with mode: 0755]
res/drawable-hdpi/dialog_bg_calling_via.9.png [new file with mode: 0644]
res/drawable-hdpi/green_selected.9.png [new file with mode: 0644]
res/drawable-hdpi/ic_button_conference_end.png [new file with mode: 0644]
res/drawable-hdpi/ic_button_conference_private.png [new file with mode: 0644]
res/drawable-hdpi/ic_button_contacts.png [new file with mode: 0644]
res/drawable-hdpi/ic_dialog_call.png [new file with mode: 0644]
res/drawable-hdpi/ic_in_call_touch_add_call.png [new file with mode: 0755]
res/drawable-hdpi/ic_in_call_touch_answer.png [new file with mode: 0755]
res/drawable-hdpi/ic_in_call_touch_dialpad.png [new file with mode: 0755]
res/drawable-hdpi/ic_in_call_touch_dialpad_close.png [new file with mode: 0755]
res/drawable-hdpi/ic_in_call_touch_end.png [new file with mode: 0755]
res/drawable-hdpi/ic_in_call_touch_hold.png [new file with mode: 0755]
res/drawable-hdpi/ic_in_call_touch_merge_call.png [new file with mode: 0755]
res/drawable-hdpi/ic_in_call_touch_round_add_call.png [new file with mode: 0755]
res/drawable-hdpi/ic_in_call_touch_round_hold.png [new file with mode: 0755]
res/drawable-hdpi/ic_in_call_touch_round_manage_conference.png [new file with mode: 0755]
res/drawable-hdpi/ic_in_call_touch_round_merge_call.png [new file with mode: 0755]
res/drawable-hdpi/ic_in_call_touch_round_swap.png [new file with mode: 0755]
res/drawable-hdpi/ic_in_call_touch_round_unhold.png [new file with mode: 0755]
res/drawable-hdpi/ic_in_call_touch_round_unhold_alt.png [new file with mode: 0755]
res/drawable-hdpi/ic_in_call_touch_swap.png [new file with mode: 0755]
res/drawable-hdpi/ic_in_call_touch_unhold.png [new file with mode: 0755]
res/drawable-hdpi/ic_incall_end.png [new file with mode: 0644]
res/drawable-hdpi/ic_incall_ongoing.png [new file with mode: 0644]
res/drawable-hdpi/ic_incall_ongoing_bluetooth.png [new file with mode: 0644]
res/drawable-hdpi/ic_incall_onhold.png [new file with mode: 0644]
res/drawable-hdpi/ic_incoming_call_bluetooth.png [new file with mode: 0644]
res/drawable-hdpi/ic_jog_dial_answer.png [new file with mode: 0755]
res/drawable-hdpi/ic_jog_dial_answer_and_end.png [new file with mode: 0755]
res/drawable-hdpi/ic_jog_dial_answer_and_hold.png [new file with mode: 0755]
res/drawable-hdpi/ic_jog_dial_decline.png [new file with mode: 0755]
res/drawable-hdpi/ic_jog_dial_silence_ringer.png [new file with mode: 0755]
res/drawable-hdpi/ic_jog_dial_sound_off.png [new file with mode: 0755]
res/drawable-hdpi/ic_jog_dial_sound_on.png [new file with mode: 0755]
res/drawable-hdpi/ic_jog_dial_unlock.png [new file with mode: 0755]
res/drawable-hdpi/ic_jog_dial_voice_search.png [new file with mode: 0755]
res/drawable-hdpi/ic_launcher_phone.png [new file with mode: 0644]
res/drawable-hdpi/ic_menu_answer_call.png [new file with mode: 0644]
res/drawable-hdpi/ic_menu_dial_pad.png [new file with mode: 0644]
res/drawable-hdpi/ic_menu_end_call.png [new file with mode: 0644]
res/drawable-hdpi/ic_menu_merge_calls.png [new file with mode: 0644]
res/drawable-hdpi/ic_menu_silence_ringer.png [new file with mode: 0644]
res/drawable-hdpi/ic_menu_swap_calls.png [new file with mode: 0644]
res/drawable-hdpi/incall_photo_border_lg.9.png [new file with mode: 0755]
res/drawable-hdpi/incall_photo_border_med.9.png [new file with mode: 0755]
res/drawable-hdpi/picture_busy.png [new file with mode: 0644]
res/drawable-hdpi/picture_conference.png [new file with mode: 0644]
res/drawable-hdpi/picture_dialing.png [new file with mode: 0644]
res/drawable-hdpi/picture_unknown.png [new file with mode: 0644]
res/drawable-hdpi/red_selected.9.png [new file with mode: 0644]
res/drawable-land/ic_incoming_call_bluetooth.png [deleted file]
res/drawable-mdpi-finger/btn_dial_action_left_disable.9.png [new file with mode: 0644]
res/drawable-mdpi-finger/btn_dial_action_left_disable_focused.9.png [new file with mode: 0644]
res/drawable-mdpi-finger/btn_dial_action_left_normal.9.png [new file with mode: 0644]
res/drawable-mdpi-finger/btn_dial_action_left_pressed.9.png [new file with mode: 0644]
res/drawable-mdpi-finger/btn_dial_action_left_selected.9.png [new file with mode: 0644]
res/drawable-mdpi-finger/btn_dial_action_middle_disable.9.png [new file with mode: 0644]
res/drawable-mdpi-finger/btn_dial_action_middle_disable_focused.9.png [new file with mode: 0644]
res/drawable-mdpi-finger/btn_dial_action_middle_normal.9.png [new file with mode: 0644]
res/drawable-mdpi-finger/btn_dial_action_middle_pressed.9.png [new file with mode: 0644]
res/drawable-mdpi-finger/btn_dial_action_middle_selected.9.png [new file with mode: 0644]
res/drawable-mdpi-finger/btn_dial_action_right_disable.9.png [new file with mode: 0644]
res/drawable-mdpi-finger/btn_dial_action_right_disable_focused.9.png [new file with mode: 0644]
res/drawable-mdpi-finger/btn_dial_action_right_normal.9.png [new file with mode: 0644]
res/drawable-mdpi-finger/btn_dial_action_right_pressed.9.png [new file with mode: 0644]
res/drawable-mdpi-finger/btn_dial_action_right_selected.9.png [new file with mode: 0644]
res/drawable-mdpi-finger/btn_dial_normal.9.png [new file with mode: 0644]
res/drawable-mdpi-finger/btn_dial_normal_blue.9.png [new file with mode: 0644]
res/drawable-mdpi-finger/btn_dial_normal_green.9.png [new file with mode: 0644]
res/drawable-mdpi-finger/btn_dial_pressed.9.png [new file with mode: 0644]
res/drawable-mdpi-finger/btn_dial_selected.9.png [new file with mode: 0644]
res/drawable-mdpi-finger/btn_dial_textfield_activated.9.png [new file with mode: 0644]
res/drawable-mdpi-finger/btn_dial_textfield_normal.9.png [new file with mode: 0644]
res/drawable-mdpi-finger/btn_dial_textfield_normal_full.9.png [moved from res/drawable-finger/btn_dial_textfield_normal_full.9.png with 100% similarity]
res/drawable-mdpi-finger/btn_dial_textfield_normal_full_sm.9.png [moved from res/drawable-finger/btn_dial_textfield_normal_full_sm.9.png with 100% similarity]
res/drawable-mdpi-finger/btn_dial_textfield_pressed.9.png [new file with mode: 0644]
res/drawable-mdpi-finger/btn_dial_textfield_selected.9.png [new file with mode: 0644]
res/drawable-mdpi-finger/dial_num_0_blk.png [new file with mode: 0644]
res/drawable-mdpi-finger/dial_num_0_wht.png [new file with mode: 0644]
res/drawable-mdpi-finger/dial_num_1_no_vm_blk.png [new file with mode: 0644]
res/drawable-mdpi-finger/dial_num_1_no_vm_wht.png [new file with mode: 0644]
res/drawable-mdpi-finger/dial_num_2_blk.png [new file with mode: 0644]
res/drawable-mdpi-finger/dial_num_2_wht.png [new file with mode: 0644]
res/drawable-mdpi-finger/dial_num_3_blk.png [new file with mode: 0644]
res/drawable-mdpi-finger/dial_num_3_wht.png [new file with mode: 0644]
res/drawable-mdpi-finger/dial_num_4_blk.png [new file with mode: 0644]
res/drawable-mdpi-finger/dial_num_4_wht.png [new file with mode: 0644]
res/drawable-mdpi-finger/dial_num_5_blk.png [new file with mode: 0644]
res/drawable-mdpi-finger/dial_num_5_wht.png [new file with mode: 0644]
res/drawable-mdpi-finger/dial_num_6_blk.png [new file with mode: 0644]
res/drawable-mdpi-finger/dial_num_6_wht.png [new file with mode: 0644]
res/drawable-mdpi-finger/dial_num_7_blk.png [new file with mode: 0644]
res/drawable-mdpi-finger/dial_num_7_wht.png [new file with mode: 0644]
res/drawable-mdpi-finger/dial_num_8_blk.png [new file with mode: 0644]
res/drawable-mdpi-finger/dial_num_8_wht.png [new file with mode: 0644]
res/drawable-mdpi-finger/dial_num_9_blk.png [new file with mode: 0644]
res/drawable-mdpi-finger/dial_num_9_wht.png [new file with mode: 0644]
res/drawable-mdpi-finger/dial_num_pound_blk.png [new file with mode: 0644]
res/drawable-mdpi-finger/dial_num_pound_wht.png [new file with mode: 0644]
res/drawable-mdpi-finger/dial_num_star_blk.png [new file with mode: 0644]
res/drawable-mdpi-finger/dial_num_star_wht.png [new file with mode: 0644]
res/drawable-mdpi-finger/ic_dial_action_call.png [new file with mode: 0644]
res/drawable-mdpi-finger/ic_dial_action_delete.png [new file with mode: 0644]
res/drawable-mdpi-finger/ic_dial_action_voice_mail.png [new file with mode: 0644]
res/drawable-mdpi-finger/ic_dial_number_blk.png [moved from res/drawable-finger/ic_dial_number_blk.png with 100% similarity]
res/drawable-mdpi-finger/ic_dial_number_wht.png [moved from res/drawable-finger/ic_dial_number_wht.png with 100% similarity]
res/drawable-mdpi-finger/ic_menu_contact.png [moved from res/drawable-finger/ic_menu_contact.png with 100% similarity]
res/drawable-mdpi-finger/ic_tab_selected_contacts.png [moved from res/drawable-finger/ic_tab_selected_contacts.png with 100% similarity]
res/drawable-mdpi-finger/ic_tab_selected_dialer.png [moved from res/drawable-finger/ic_tab_selected_dialer.png with 100% similarity]
res/drawable-mdpi-finger/ic_tab_selected_recent.png [moved from res/drawable-finger/ic_tab_selected_recent.png with 100% similarity]
res/drawable-mdpi-finger/ic_tab_selected_stared.png [moved from res/drawable-finger/ic_tab_selected_stared.png with 100% similarity]
res/drawable-mdpi-finger/ic_tab_unselected_contacts.png [moved from res/drawable-finger/ic_tab_unselected_contacts.png with 100% similarity]
res/drawable-mdpi-finger/ic_tab_unselected_dialer.png [moved from res/drawable-finger/ic_tab_unselected_dialer.png with 100% similarity]
res/drawable-mdpi-finger/ic_tab_unselected_recent.png [moved from res/drawable-finger/ic_tab_unselected_recent.png with 100% similarity]
res/drawable-mdpi-finger/ic_tab_unselected_stared.png [moved from res/drawable-finger/ic_tab_unselected_stared.png with 100% similarity]
res/drawable-mdpi/bg_in_call_gradient_bluetooth.9.png [new file with mode: 0755]
res/drawable-mdpi/bg_in_call_gradient_connected.9.png [new file with mode: 0755]
res/drawable-mdpi/bg_in_call_gradient_ended.9.png [new file with mode: 0755]
res/drawable-mdpi/bg_in_call_gradient_on_hold.9.png [new file with mode: 0755]
res/drawable-mdpi/bg_in_call_gradient_unidentified.9.png [new file with mode: 0755]
res/drawable-mdpi/btn_in_call_answer_dotted_green.9.png [new file with mode: 0755]
res/drawable-mdpi/btn_in_call_answer_dotted_red.9.png [new file with mode: 0755]
res/drawable-mdpi/btn_in_call_answer_normal.9.png [new file with mode: 0755]
res/drawable-mdpi/btn_in_call_answer_pressed.9.png [new file with mode: 0755]
res/drawable-mdpi/btn_in_call_main_disable.9.png [new file with mode: 0755]
res/drawable-mdpi/btn_in_call_main_disable_focused.9.png [new file with mode: 0755]
res/drawable-mdpi/btn_in_call_main_normal.9.png [moved from res/drawable-finger/dial_num_0_blk.png with 72% similarity, mode: 0755]
res/drawable-mdpi/btn_in_call_main_pressed.9.png [new file with mode: 0755]
res/drawable-mdpi/btn_in_call_main_selected.9.png [new file with mode: 0755]
res/drawable-mdpi/btn_in_call_manage_conf_normal.9.png [new file with mode: 0755]
res/drawable-mdpi/btn_in_call_manage_conf_pressed.9.png [new file with mode: 0755]
res/drawable-mdpi/btn_in_call_manage_conf_selected.9.png [new file with mode: 0755]
res/drawable-mdpi/btn_in_call_round_disable.png [new file with mode: 0755]
res/drawable-mdpi/btn_in_call_round_disable_focused.png [new file with mode: 0755]
res/drawable-mdpi/btn_in_call_round_normal.png [new file with mode: 0755]
res/drawable-mdpi/btn_in_call_round_pressed.png [new file with mode: 0755]
res/drawable-mdpi/btn_in_call_round_selected.png [new file with mode: 0755]
res/drawable-mdpi/btn_in_call_switch_off_disable.9.png [new file with mode: 0755]
res/drawable-mdpi/btn_in_call_switch_off_disable_focused.9.png [new file with mode: 0755]
res/drawable-mdpi/btn_in_call_switch_off_normal.9.png [new file with mode: 0755]
res/drawable-mdpi/btn_in_call_switch_off_pressed.9.png [new file with mode: 0755]
res/drawable-mdpi/btn_in_call_switch_off_selected.9.png [new file with mode: 0755]
res/drawable-mdpi/btn_in_call_switch_on_disable.9.png [new file with mode: 0755]
res/drawable-mdpi/btn_in_call_switch_on_disable_focused.9.png [new file with mode: 0755]
res/drawable-mdpi/btn_in_call_switch_on_normal.9.png [new file with mode: 0755]
res/drawable-mdpi/btn_in_call_switch_on_pressed.9.png [new file with mode: 0755]
res/drawable-mdpi/btn_in_call_switch_on_selected.9.png [new file with mode: 0755]
res/drawable-mdpi/dialog_bg_calling_via.9.png [new file with mode: 0644]
res/drawable-mdpi/green_selected.9.png [new file with mode: 0644]
res/drawable-mdpi/ic_btn_next.png [new file with mode: 0755]
res/drawable-mdpi/ic_button_conference_end.png [moved from res/drawable/ic_button_conference_end.png with 100% similarity]
res/drawable-mdpi/ic_button_conference_private.png [moved from res/drawable/ic_button_conference_private.png with 100% similarity]
res/drawable-mdpi/ic_button_contacts.png [moved from res/drawable/ic_button_contacts.png with 100% similarity]
res/drawable-mdpi/ic_dialog_call.png [moved from res/drawable/ic_dialog_call.png with 100% similarity]
res/drawable-mdpi/ic_in_call_touch_add_call.png [new file with mode: 0755]
res/drawable-mdpi/ic_in_call_touch_answer.png [new file with mode: 0755]
res/drawable-mdpi/ic_in_call_touch_dialpad.png [new file with mode: 0755]
res/drawable-mdpi/ic_in_call_touch_dialpad_close.png [new file with mode: 0755]
res/drawable-mdpi/ic_in_call_touch_end.png [new file with mode: 0755]
res/drawable-mdpi/ic_in_call_touch_hold.png [new file with mode: 0755]
res/drawable-mdpi/ic_in_call_touch_merge_call.png [new file with mode: 0755]
res/drawable-mdpi/ic_in_call_touch_round_add_call.png [new file with mode: 0755]
res/drawable-mdpi/ic_in_call_touch_round_hold.png [new file with mode: 0755]
res/drawable-mdpi/ic_in_call_touch_round_manage_conference.png [new file with mode: 0755]
res/drawable-mdpi/ic_in_call_touch_round_merge_call.png [new file with mode: 0755]
res/drawable-mdpi/ic_in_call_touch_round_swap.png [new file with mode: 0755]
res/drawable-mdpi/ic_in_call_touch_round_unhold.png [new file with mode: 0755]
res/drawable-mdpi/ic_in_call_touch_round_unhold_alt.png [new file with mode: 0755]
res/drawable-mdpi/ic_in_call_touch_swap.png [new file with mode: 0755]
res/drawable-mdpi/ic_in_call_touch_unhold.png [new file with mode: 0755]
res/drawable-mdpi/ic_incall_end.png [moved from res/drawable/ic_incall_end.png with 100% similarity]
res/drawable-mdpi/ic_incall_ongoing.png [moved from res/drawable/ic_incall_ongoing.png with 100% similarity]
res/drawable-mdpi/ic_incall_ongoing_bluetooth.png [moved from res/drawable/ic_incall_ongoing_bluetooth.png with 100% similarity]
res/drawable-mdpi/ic_incall_onhold.png [moved from res/drawable/ic_incall_onhold.png with 100% similarity]
res/drawable-mdpi/ic_incoming_call_bluetooth.png [moved from res/drawable/ic_incoming_call_bluetooth.png with 100% similarity]
res/drawable-mdpi/ic_jog_dial_answer.png [new file with mode: 0755]
res/drawable-mdpi/ic_jog_dial_answer_and_end.png [new file with mode: 0755]
res/drawable-mdpi/ic_jog_dial_answer_and_hold.png [new file with mode: 0755]
res/drawable-mdpi/ic_jog_dial_decline.png [new file with mode: 0755]
res/drawable-mdpi/ic_jog_dial_silence_ringer.png [new file with mode: 0755]
res/drawable-mdpi/ic_jog_dial_sound_off.png [new file with mode: 0755]
res/drawable-mdpi/ic_jog_dial_sound_on.png [new file with mode: 0755]
res/drawable-mdpi/ic_jog_dial_unlock.png [new file with mode: 0755]
res/drawable-mdpi/ic_jog_dial_voice_search.png [new file with mode: 0755]
res/drawable-mdpi/ic_launcher_phone.png [moved from res/drawable/ic_launcher_phone.png with 100% similarity]
res/drawable-mdpi/ic_menu_answer_call.png [moved from res/drawable/ic_menu_answer_call.png with 100% similarity]
res/drawable-mdpi/ic_menu_dial_pad.png [moved from res/drawable/ic_menu_dial_pad.png with 100% similarity]
res/drawable-mdpi/ic_menu_end_call.png [moved from res/drawable/ic_menu_end_call.png with 100% similarity]
res/drawable-mdpi/ic_menu_merge_calls.png [moved from res/drawable/ic_menu_merge_calls.png with 100% similarity]
res/drawable-mdpi/ic_menu_silence_ringer.png [moved from res/drawable/ic_menu_silence_ringer.png with 100% similarity]
res/drawable-mdpi/ic_menu_swap_calls.png [moved from res/drawable/ic_menu_swap_calls.png with 100% similarity]
res/drawable-mdpi/incall_photo_border_lg.9.png [new file with mode: 0755]
res/drawable-mdpi/incall_photo_border_med.9.png [new file with mode: 0755]
res/drawable-mdpi/picture_busy.png [moved from res/drawable/picture_busy.png with 100% similarity]
res/drawable-mdpi/picture_conference.png [moved from res/drawable/picture_conference.png with 100% similarity]
res/drawable-mdpi/picture_dialing.png [moved from res/drawable/picture_dialing.png with 100% similarity]
res/drawable-mdpi/picture_unknown.png [moved from res/drawable/picture_unknown.png with 100% similarity]
res/drawable-mdpi/red_selected.9.png [new file with mode: 0644]
res/drawable/green_divider.png [new file with mode: 0644]
res/drawable/incall_button.xml [new file with mode: 0644]
res/drawable/incall_frame_bluetooth_short.9.png [deleted file]
res/drawable/incall_frame_bluetooth_tall_land.9.png [deleted file]
res/drawable/incall_frame_bluetooth_tall_port.9.png [deleted file]
res/drawable/incall_frame_connected_short.9.png [deleted file]
res/drawable/incall_frame_connected_tall_land.9.png [deleted file]
res/drawable/incall_frame_connected_tall_port.9.png [deleted file]
res/drawable/incall_frame_ended_tall_land.9.png [deleted file]
res/drawable/incall_frame_ended_tall_port.9.png [deleted file]
res/drawable/incall_frame_hold_short.9.png [deleted file]
res/drawable/incall_frame_hold_tall_land.9.png [deleted file]
res/drawable/incall_frame_hold_tall_port.9.png [deleted file]
res/drawable/incall_frame_normal_tall_land.9.png [deleted file]
res/drawable/incall_frame_normal_tall_port.9.png [deleted file]
res/drawable/incall_photo_border.9.png [deleted file]
res/drawable/incall_round_button.xml [new file with mode: 0644]
res/drawable/incall_toggle_button.xml [new file with mode: 0644]
res/drawable/manage_conference_photo_button.xml [moved from res/drawable-finger/btn_dialer.xml with 62% similarity]
res/drawable/picture_emergency.png [deleted file]
res/drawable/picture_emergency25x25.png [moved from res/drawable-finger/dial_num_1_blk.png with 73% similarity]
res/drawable/picture_emergency32x32.png [new file with mode: 0644]
res/layout-finger/dialpad.xml
res/layout-finger/dtmf_dialer_display.xml [deleted file]
res/layout-finger/dtmf_twelve_key_dialer.xml
res/layout-finger/emergency_dialer.xml
res/layout-finger/non_drawer_dialpad.xml [new file with mode: 0644]
res/layout-finger/voicemail_dial_delete.xml [new file with mode: 0644]
res/layout-land-finger/dtmf_dialer_display.xml [deleted file]
res/layout-land-finger/dtmf_twelve_key_dialer.xml [deleted file]
res/layout-land-finger/emergency_dialer.xml
res/layout-land/call_card_person_info.xml [deleted file]
res/layout-long-finger/dialpad.xml [new file with mode: 0644]
res/layout-long-finger/emergency_dialer.xml [new file with mode: 0644]
res/layout-long-finger/non_drawer_dialpad.xml [new file with mode: 0644]
res/layout-long-finger/voicemail_dial_delete.xml [new file with mode: 0644]
res/layout-long-land-finger/emergency_dialer.xml [new file with mode: 0644]
res/layout/call_card.xml
res/layout/call_card_person_info.xml
res/layout/call_card_popup.xml [deleted file]
res/layout/caller_in_conference.xml
res/layout/ecbm_layout.xml [deleted file]
res/layout/incall_screen.xml
res/layout/incall_touch_ui.xml [new file with mode: 0644]
res/layout/manage_conference_panel.xml [new file with mode: 0644]
res/layout/onscreen_answer_ui.xml [deleted file]
res/layout/otacall_card.xml [new file with mode: 0644]
res/values-cs/strings.xml
res/values-da/strings.xml
res/values-de/strings.xml
res/values-el/strings.xml
res/values-es-rUS/strings.xml
res/values-es/strings.xml
res/values-fr/strings.xml
res/values-it/strings.xml
res/values-ja/strings.xml
res/values-ko/strings.xml
res/values-nb/strings.xml
res/values-nl/strings.xml
res/values-pl/strings.xml
res/values-pt-rPT/strings.xml
res/values-pt/strings.xml
res/values-ru/strings.xml
res/values-sv/strings.xml
res/values-tr/strings.xml
res/values-zh-rCN/strings.xml
res/values-zh-rTW/strings.xml
res/values/attrs.xml
res/values/colors.xml
res/values/config.xml
res/values/dimens.xml [new file with mode: 0644]
res/values/ids.xml
res/values/strings.xml
res/values/styles.xml
res/xml/call_feature_setting.xml
res/xml/callforward_options.xml [new file with mode: 0644]
res/xml/cdma_call_feature_setting.xml [deleted file]
res/xml/cdma_call_options.xml [new file with mode: 0644]
res/xml/cdma_options.xml
res/xml/gsm_umts_additional_options.xml [new file with mode: 0644]
res/xml/gsm_umts_call_options.xml [new file with mode: 0644]
res/xml/gsm_umts_options.xml
res/xml/network_setting.xml
res/xml/network_setting_cdma.xml [deleted file]
src/com/android/phone/ADNList.java
src/com/android/phone/BluetoothAtPhonebook.java
src/com/android/phone/BluetoothHandsfree.java
src/com/android/phone/BluetoothHeadsetService.java
src/com/android/phone/ButtonGridLayout.java
src/com/android/phone/CLIRListPreference.java [new file with mode: 0644]
src/com/android/phone/CallCard.java
src/com/android/phone/CallFeaturesSetting.java [changed mode: 0755->0644]
src/com/android/phone/CallForwardEditPreference.java [new file with mode: 0644]
src/com/android/phone/CallNotifier.java
src/com/android/phone/CallWaitingCheckBoxPreference.java [new file with mode: 0644]
src/com/android/phone/CdmaCallOptions.java [new file with mode: 0644]
src/com/android/phone/CdmaOptions.java
src/com/android/phone/CdmaRoamingListPreference.java [new file with mode: 0644]
src/com/android/phone/CdmaVoicePrivacyCheckBoxPreference.java [new file with mode: 0644]
src/com/android/phone/DTMFTwelveKeyDialer.java
src/com/android/phone/DTMFTwelveKeyDialerView.java
src/com/android/phone/DialtactsActivity.java [deleted file]
src/com/android/phone/EditPhoneNumberPreference.java
src/com/android/phone/EmergencyCallHandler.java
src/com/android/phone/EmergencyCallbackMode.java [deleted file]
src/com/android/phone/EmergencyCallbackModeExitDialog.java [new file with mode: 0644]
src/com/android/phone/EmergencyCallbackModeService.java [new file with mode: 0644]
src/com/android/phone/EmergencyDialer.java
src/com/android/phone/GsmUmtsAdditionalCallOptions.java [new file with mode: 0644]
src/com/android/phone/GsmUmtsCallForwardOptions.java [new file with mode: 0644]
src/com/android/phone/GsmUmtsCallOptions.java [new file with mode: 0644]
src/com/android/phone/GsmUmtsOptions.java
src/com/android/phone/IccPanel.java
src/com/android/phone/InCallControlState.java [new file with mode: 0644]
src/com/android/phone/InCallMenu.java
src/com/android/phone/InCallScreen.java
src/com/android/phone/InCallScreenShowActivation.java [new file with mode: 0644]
src/com/android/phone/InCallTouchUi.java [new file with mode: 0644]
src/com/android/phone/ManageConferenceUtils.java [new file with mode: 0644]
src/com/android/phone/NotificationMgr.java
src/com/android/phone/OtaStartupReceiver.java [new file with mode: 0644]
src/com/android/phone/OtaUtils.java [new file with mode: 0644]
src/com/android/phone/OutgoingCallBroadcaster.java
src/com/android/phone/OutgoingCallReceiver.java [deleted file]
src/com/android/phone/PhoneApp.java
src/com/android/phone/PhoneInterfaceManager.java
src/com/android/phone/PhoneUtils.java
src/com/android/phone/Ringer.java
src/com/android/phone/Settings.java
src/com/android/phone/SimContacts.java
src/com/android/phone/SpecialCharSequenceMgr.java
src/com/android/phone/TimeConsumingPreferenceActivity.java [new file with mode: 0644]
src/com/android/phone/Use2GOnlyCheckBoxPreference.java [new file with mode: 0644]

index c9ab4b9..5beef61 100644 (file)
@@ -4,9 +4,9 @@
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
-  
+
           http://www.apache.org/licenses/LICENSE-2.0
-  
+
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -32,7 +32,7 @@
     <protected-broadcast android:name="android.intent.action.ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS" />
     <protected-broadcast android:name="android.intent.action.ACTION_MDN_STATE_CHANGED" />
     <protected-broadcast android:name="android.provider.Telephony.SPN_STRINGS_UPDATED" />
-    
+
     <uses-permission android:name="android.permission.BROADCAST_STICKY" />
     <uses-permission android:name="android.permission.CALL_PHONE" />
     <uses-permission android:name="android.permission.CALL_PRIVILEGED" />
@@ -65,6 +65,9 @@
     <uses-permission android:name="android.permission.WRITE_APN_SETTINGS" />
     <uses-permission android:name="android.permission.BROADCAST_SMS"/>
     <uses-permission android:name="android.permission.BROADCAST_WAP_PUSH"/>
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.SHUTDOWN" />
 
     <application android:name="PhoneApp"
                  android:persistent="true"
                 <action android:name="android.intent.action.CALL" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <data android:mimeType="vnd.android.cursor.item/phone" />
+                <data android:mimeType="vnd.android.cursor.item/phone_v2" />
                 <data android:mimeType="vnd.android.cursor.item/person" />
             </intent-filter>
         </activity>
 
         <activity-alias android:name="PrivilegedOutgoingCallBroadcaster"
                 android:targetActivity="OutgoingCallBroadcaster"
+                android:theme="@android:style/Theme.NoDisplay"
                 android:permission="android.permission.CALL_PRIVILEGED">
             <intent-filter>
                 <action android:name="android.intent.action.CALL_PRIVILEGED" />
                 <action android:name="android.intent.action.CALL_PRIVILEGED" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <data android:mimeType="vnd.android.cursor.item/phone" />
+                <data android:mimeType="vnd.android.cursor.item/phone_v2" />
                 <data android:mimeType="vnd.android.cursor.item/person" />
             </intent-filter>
         </activity-alias>
             </intent-filter>
         </receiver>
 
-        <receiver android:name="OutgoingCallReceiver" android:exported="false">
-            <intent-filter android:priority="-100">
-                <action android:name="android.intent.action.NEW_OUTGOING_CALL" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </receiver>
-
         <activity android:name="InCallScreen"
             android:theme="@android:style/Theme.NoTitleBar"
             android:label="@string/phoneIconLabel"
             android:excludeFromRecents="true"
             android:launchMode="singleInstance"
-            android:screenOrientation="nosensor"
-            android:exported="false" />
+            android:screenOrientation="portrait"
+            android:configChanges="orientation|keyboardHidden"
+            android:exported="false">
+        </activity>
+
+        <activity android:name="InCallScreenShowActivation"
+            android:permission="android.permission.PERFORM_CDMA_PROVISIONING"
+            android:label="@string/phoneIconLabel"
+            android:excludeFromRecents="true">
+            <intent-filter>
+                <action android:name="com.android.phone.InCallScreen.SHOW_ACTIVATION" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
 
         <!-- general settings -->
         <activity android:name="Settings" android:label="@string/settings_label">
         <!-- networks setting -->
         <!-- service to handle network query requests sent to RIL -->
         <service android:name="NetworkQueryService" />
-        
+
         <activity android:name="NetworkSetting" android:label="@string/networks">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>
         </activity>
 
+        <activity android:name="GsmUmtsCallOptions"
+            android:label="@string/gsm_umts_options">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="CdmaCallOptions"
+            android:label="@string/cdma_options">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="GsmUmtsCallForwardOptions"
+            android:label="@string/labelCF">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="GsmUmtsAdditionalCallOptions"
+            android:label="@string/labelGSMMore">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+            </intent-filter>
+        </activity>
+
         <activity android:name="CellBroadcastSms"
             android:label="@string/cell_broadcast_sms">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>
         </activity>
-        
+
         <!-- fdn setting -->
         <activity android:name="FdnSetting" android:label="@string/fdn">
             <intent-filter>
         <activity android:name="EditFdnContactScreen">
         </activity>
 
-        <activity android:name="DeleteFdnContactScreen" 
+        <activity android:name="DeleteFdnContactScreen"
         android:label="@string/delete_fdn_contact">
         </activity>
-        
+
         <activity android:name="DataRoamingReenable" android:label="@string/android:dialog_alert_title"
             android:theme="@android:style/Theme.Dialog">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>
         </activity>
-        
-        <!-- Emergency Callback Mode screen -->
-        <activity android:name="EmergencyCallbackMode" 
-                android:label="Emergency Call Back"
-                android:theme="@style/EmergencyCallBack"
-                android:launchMode="singleTask"
-                android:taskAffinity=":EmergencyCallbackMode">
-        </activity>
 
         <!-- call feature setting -->
-        <activity android:name="CallFeaturesSetting" android:label="@string/call_settings">
+        <activity android:name="CallFeaturesSetting" android:label="@string/call_settings"
+            android:configChanges="orientation|keyboardHidden">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="com.android.phone.CallFeaturesSetting.ADD_VOICEMAIL" />
+                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
 
             android:excludeFromRecents="true"
             android:launchMode="singleInstance">
         </activity>
-        
+
         <!-- bluetooth headset service -->
         <service android:name="BluetoothHeadsetService">
             <intent-filter>
                 <action android:name="android.bluetooth.IBluetoothHeadset" />
             </intent-filter>
         </service>
+
+        <!-- Broadcast Receiver that will process BOOT Complete and launch OTA -->
+        <receiver android:name="OtaStartupReceiver" android:exported="false">
+            <intent-filter android:priority="100">
+                 <action android:name="android.intent.action.BOOT_COMPLETED"/>
+            </intent-filter>
+        </receiver>
+
+        <!-- CDMA Emergency Callback Mode -->
+        <service android:name="EmergencyCallbackModeService">
+        </service>
+
+        <activity android:name="EmergencyCallbackModeExitDialog"
+            android:excludeFromRecents="true"
+            android:label="@string/ecm_exit_dialog"
+            android:launchMode="singleTop"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar">
+            <intent-filter>
+                <action android:name="com.android.phone.action.ACTION_SHOW_ECM_EXIT_DIALOG" />
+                <action android:name="android.intent.action.ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
     </application>
 </manifest>
 
index f1d2c80..a841adc 100644 (file)
@@ -4,9 +4,9 @@
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
-  
+
           http://www.apache.org/licenses/LICENSE-2.0
-  
+
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -21,7 +21,7 @@
 
     <item android:state_pressed="true" android:color="#000"/>
     <item android:state_selected="true" android:color="#000"/>
-    <item android:state_focused="true" android:color="#000"/>
+    <item android:state_focused="true" android:color="#FFF"/>
     <item android:color="#FFF"/> <!-- not selected -->
 
 </selector>
diff --git a/res/color-finger/ota_title_color.xml b/res/color-finger/ota_title_color.xml
new file mode 100644 (file)
index 0000000..2081703
--- /dev/null
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * Copyright (c) 2008 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="#FFA6C839"/>
+</selector>
+
index 4dfcd64..52f26b1 100644 (file)
      limitations under the License.
 -->
 
+<!-- Background resource for digit buttons in the various dialpads
+     used by the phone app (see dialpad.xml).
+     Also see btn_dial_green.xml for a slight variation of this,
+     used in the new "non-drawer" in-call dialpad. -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true"
         android:drawable="@drawable/btn_dial_pressed" />
diff --git a/res/drawable-finger/btn_dial_action.xml b/res/drawable-finger/btn_dial_action.xml
new file mode 100644 (file)
index 0000000..9ffb31b
--- /dev/null
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Background resource for dial button for the various 12 key dialers. -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- Disabled views -->
+    <item android:state_focused="true" android:state_enabled="false"
+        android:drawable="@drawable/btn_dial_action_middle_disable_focused" />
+    <item android:state_enabled="false"
+        android:drawable="@drawable/btn_dial_action_middle_disable" />
+
+    <!-- Enabled views -->
+    <item android:state_pressed="true" android:state_enabled="true"
+        android:drawable="@drawable/btn_dial_action_middle_pressed" />
+    <item android:state_focused="true" android:state_enabled="true"
+        android:drawable="@drawable/btn_dial_action_middle_selected" />
+    <item android:state_enabled="true"
+        android:drawable="@drawable/btn_dial_action_middle_normal" />
+</selector>
similarity index 57%
rename from res/drawable-finger/dial_num_1.xml
rename to res/drawable-finger/btn_dial_blue.xml
index 48737b2..d06aaf9 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
+<!-- Copyright (C) 2009 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      limitations under the License.
 -->
 
+<!-- Background resource for digit buttons in the "new" style in-call
+     DTMF dialpad (see non_drawer_dialpad.xml) when bluetooth is used.
+     This is just like btn_dial.xml, except the default state uses the
+     "normal_blue" asset rather than the plain "normal" asset. -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" 
-        android:drawable="@drawable/dial_num_1_blk" />
+    <item android:state_pressed="true"
+        android:drawable="@drawable/btn_dial_pressed" />
     <item android:state_focused="true"
-        android:drawable="@drawable/dial_num_1_blk" />
+        android:drawable="@drawable/btn_dial_selected" />
     <item
-        android:drawable="@drawable/dial_num_1_wht" />
+        android:drawable="@drawable/btn_dial_normal_blue" />
 </selector>
-
index 235554d..b8c672d 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
+<!-- Copyright (C) 2009 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      limitations under the License.
 -->
 
+<!-- Background resource for backspace button for the various 12 key dialers. -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" 
-        android:drawable="@drawable/btn_dial_delete_pressed" />
-    <item android:state_focused="true"
-        android:drawable="@drawable/btn_dial_delete_selected" />
-    <item
-        android:drawable="@drawable/btn_dial_delete_normal" />
+    <!-- Disabled views -->
+    <item android:state_focused="true" android:state_enabled="false"
+        android:drawable="@drawable/btn_dial_action_right_disable_focused" />
+    <item android:state_enabled="false"
+        android:drawable="@drawable/btn_dial_action_right_disable" />
+
+    <!-- Enabled views -->
+    <item android:state_pressed="true" android:state_enabled="true"
+        android:drawable="@drawable/btn_dial_action_right_pressed" />
+    <item android:state_focused="true" android:state_enabled="true"
+        android:drawable="@drawable/btn_dial_action_right_selected" />
+    <item android:state_enabled="true"
+        android:drawable="@drawable/btn_dial_action_right_normal" />
 </selector>
 
diff --git a/res/drawable-finger/btn_dial_delete_activated.9.png b/res/drawable-finger/btn_dial_delete_activated.9.png
deleted file mode 100644 (file)
index 453a368..0000000
Binary files a/res/drawable-finger/btn_dial_delete_activated.9.png and /dev/null differ
diff --git a/res/drawable-finger/btn_dial_delete_normal.9.png b/res/drawable-finger/btn_dial_delete_normal.9.png
deleted file mode 100644 (file)
index 32b95c9..0000000
Binary files a/res/drawable-finger/btn_dial_delete_normal.9.png and /dev/null differ
diff --git a/res/drawable-finger/btn_dial_delete_pressed.9.png b/res/drawable-finger/btn_dial_delete_pressed.9.png
deleted file mode 100644 (file)
index 6e12b32..0000000
Binary files a/res/drawable-finger/btn_dial_delete_pressed.9.png and /dev/null differ
diff --git a/res/drawable-finger/btn_dial_delete_selected.9.png b/res/drawable-finger/btn_dial_delete_selected.9.png
deleted file mode 100644 (file)
index 4aa9131..0000000
Binary files a/res/drawable-finger/btn_dial_delete_selected.9.png and /dev/null differ
similarity index 58%
rename from res/drawable-finger/btn_dial_delete_active.xml
rename to res/drawable-finger/btn_dial_green.xml
index 3403f34..2a4df8e 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
+<!-- Copyright (C) 2009 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      limitations under the License.
 -->
 
+<!-- Background resource for digit buttons in the "new" style in-call
+     DTMF dialpad (see non_drawer_dialpad.xml). 
+     This is just like btn_dial.xml, except the default state uses the
+     "normal_green" asset rather than the plain "normal" asset. -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" 
-        android:drawable="@drawable/btn_dial_delete_pressed" />
+    <item android:state_pressed="true"
+        android:drawable="@drawable/btn_dial_pressed" />
     <item android:state_focused="true"
-        android:drawable="@drawable/btn_dial_delete_selected" />
+        android:drawable="@drawable/btn_dial_selected" />
     <item
-        android:drawable="@drawable/btn_dial_delete_activated" />
+        android:drawable="@drawable/btn_dial_normal_green" />
 </selector>
-
diff --git a/res/drawable-finger/btn_dial_normal.png b/res/drawable-finger/btn_dial_normal.png
deleted file mode 100644 (file)
index ff8796b..0000000
Binary files a/res/drawable-finger/btn_dial_normal.png and /dev/null differ
diff --git a/res/drawable-finger/btn_dial_pressed.png b/res/drawable-finger/btn_dial_pressed.png
deleted file mode 100644 (file)
index 3c198c4..0000000
Binary files a/res/drawable-finger/btn_dial_pressed.png and /dev/null differ
diff --git a/res/drawable-finger/btn_dial_selected.png b/res/drawable-finger/btn_dial_selected.png
deleted file mode 100644 (file)
index 8ca2b0d..0000000
Binary files a/res/drawable-finger/btn_dial_selected.png and /dev/null differ
diff --git a/res/drawable-finger/btn_dial_textfield_activated.9.png b/res/drawable-finger/btn_dial_textfield_activated.9.png
deleted file mode 100644 (file)
index 093e850..0000000
Binary files a/res/drawable-finger/btn_dial_textfield_activated.9.png and /dev/null differ
diff --git a/res/drawable-finger/btn_dial_textfield_normal.9.png b/res/drawable-finger/btn_dial_textfield_normal.9.png
deleted file mode 100644 (file)
index d310eec..0000000
Binary files a/res/drawable-finger/btn_dial_textfield_normal.9.png and /dev/null differ
diff --git a/res/drawable-finger/btn_dial_textfield_pressed.9.png b/res/drawable-finger/btn_dial_textfield_pressed.9.png
deleted file mode 100644 (file)
index 64f5570..0000000
Binary files a/res/drawable-finger/btn_dial_textfield_pressed.9.png and /dev/null differ
diff --git a/res/drawable-finger/btn_dial_textfield_selected.9.png b/res/drawable-finger/btn_dial_textfield_selected.9.png
deleted file mode 100644 (file)
index 7a1eb56..0000000
Binary files a/res/drawable-finger/btn_dial_textfield_selected.9.png and /dev/null differ
diff --git a/res/drawable-finger/btn_dialer_default.png b/res/drawable-finger/btn_dialer_default.png
deleted file mode 100644 (file)
index de80a9b..0000000
Binary files a/res/drawable-finger/btn_dialer_default.png and /dev/null differ
diff --git a/res/drawable-finger/btn_dialer_pressed.9.png b/res/drawable-finger/btn_dialer_pressed.9.png
deleted file mode 100644 (file)
index d3c0056..0000000
Binary files a/res/drawable-finger/btn_dialer_pressed.9.png and /dev/null differ
diff --git a/res/drawable-finger/btn_dialer_selected.9.png b/res/drawable-finger/btn_dialer_selected.9.png
deleted file mode 100644 (file)
index 4eb3fc8..0000000
Binary files a/res/drawable-finger/btn_dialer_selected.9.png and /dev/null differ
diff --git a/res/drawable-finger/dial_num_0_wht.png b/res/drawable-finger/dial_num_0_wht.png
deleted file mode 100644 (file)
index 892aa00..0000000
Binary files a/res/drawable-finger/dial_num_0_wht.png and /dev/null differ
diff --git a/res/drawable-finger/dial_num_1_no_vm_blk.png b/res/drawable-finger/dial_num_1_no_vm_blk.png
deleted file mode 100644 (file)
index 7c0f2bd..0000000
Binary files a/res/drawable-finger/dial_num_1_no_vm_blk.png and /dev/null differ
diff --git a/res/drawable-finger/dial_num_1_no_vm_wht.png b/res/drawable-finger/dial_num_1_no_vm_wht.png
deleted file mode 100644 (file)
index a1576e2..0000000
Binary files a/res/drawable-finger/dial_num_1_no_vm_wht.png and /dev/null differ
diff --git a/res/drawable-finger/dial_num_1_wht.png b/res/drawable-finger/dial_num_1_wht.png
deleted file mode 100644 (file)
index 7e68765..0000000
Binary files a/res/drawable-finger/dial_num_1_wht.png and /dev/null differ
diff --git a/res/drawable-finger/dial_num_2_blk.png b/res/drawable-finger/dial_num_2_blk.png
deleted file mode 100644 (file)
index 37ad140..0000000
Binary files a/res/drawable-finger/dial_num_2_blk.png and /dev/null differ
diff --git a/res/drawable-finger/dial_num_2_wht.png b/res/drawable-finger/dial_num_2_wht.png
deleted file mode 100644 (file)
index 361520c..0000000
Binary files a/res/drawable-finger/dial_num_2_wht.png and /dev/null differ
diff --git a/res/drawable-finger/dial_num_3_blk.png b/res/drawable-finger/dial_num_3_blk.png
deleted file mode 100644 (file)
index cd6b6d9..0000000
Binary files a/res/drawable-finger/dial_num_3_blk.png and /dev/null differ
diff --git a/res/drawable-finger/dial_num_3_wht.png b/res/drawable-finger/dial_num_3_wht.png
deleted file mode 100644 (file)
index 1d10164..0000000
Binary files a/res/drawable-finger/dial_num_3_wht.png and /dev/null differ
diff --git a/res/drawable-finger/dial_num_4_blk.png b/res/drawable-finger/dial_num_4_blk.png
deleted file mode 100644 (file)
index 9289e94..0000000
Binary files a/res/drawable-finger/dial_num_4_blk.png and /dev/null differ
diff --git a/res/drawable-finger/dial_num_4_wht.png b/res/drawable-finger/dial_num_4_wht.png
deleted file mode 100644 (file)
index 568a224..0000000
Binary files a/res/drawable-finger/dial_num_4_wht.png and /dev/null differ
diff --git a/res/drawable-finger/dial_num_5_blk.png b/res/drawable-finger/dial_num_5_blk.png
deleted file mode 100644 (file)
index 61444ff..0000000
Binary files a/res/drawable-finger/dial_num_5_blk.png and /dev/null differ
diff --git a/res/drawable-finger/dial_num_5_wht.png b/res/drawable-finger/dial_num_5_wht.png
deleted file mode 100644 (file)
index 8122cc5..0000000
Binary files a/res/drawable-finger/dial_num_5_wht.png and /dev/null differ
diff --git a/res/drawable-finger/dial_num_6_blk.png b/res/drawable-finger/dial_num_6_blk.png
deleted file mode 100644 (file)
index cebcc0d..0000000
Binary files a/res/drawable-finger/dial_num_6_blk.png and /dev/null differ
diff --git a/res/drawable-finger/dial_num_6_wht.png b/res/drawable-finger/dial_num_6_wht.png
deleted file mode 100644 (file)
index c397c1e..0000000
Binary files a/res/drawable-finger/dial_num_6_wht.png and /dev/null differ
diff --git a/res/drawable-finger/dial_num_7_blk.png b/res/drawable-finger/dial_num_7_blk.png
deleted file mode 100644 (file)
index 026919b..0000000
Binary files a/res/drawable-finger/dial_num_7_blk.png and /dev/null differ
diff --git a/res/drawable-finger/dial_num_7_wht.png b/res/drawable-finger/dial_num_7_wht.png
deleted file mode 100644 (file)
index 618f440..0000000
Binary files a/res/drawable-finger/dial_num_7_wht.png and /dev/null differ
diff --git a/res/drawable-finger/dial_num_8_blk.png b/res/drawable-finger/dial_num_8_blk.png
deleted file mode 100644 (file)
index aef79b2..0000000
Binary files a/res/drawable-finger/dial_num_8_blk.png and /dev/null differ
diff --git a/res/drawable-finger/dial_num_8_wht.png b/res/drawable-finger/dial_num_8_wht.png
deleted file mode 100644 (file)
index cece6bf..0000000
Binary files a/res/drawable-finger/dial_num_8_wht.png and /dev/null differ
diff --git a/res/drawable-finger/dial_num_9_blk.png b/res/drawable-finger/dial_num_9_blk.png
deleted file mode 100644 (file)
index d85873d..0000000
Binary files a/res/drawable-finger/dial_num_9_blk.png and /dev/null differ
diff --git a/res/drawable-finger/dial_num_9_wht.png b/res/drawable-finger/dial_num_9_wht.png
deleted file mode 100644 (file)
index 6844efe..0000000
Binary files a/res/drawable-finger/dial_num_9_wht.png and /dev/null differ
diff --git a/res/drawable-finger/dial_num_pound_blk.png b/res/drawable-finger/dial_num_pound_blk.png
deleted file mode 100644 (file)
index b15b044..0000000
Binary files a/res/drawable-finger/dial_num_pound_blk.png and /dev/null differ
diff --git a/res/drawable-finger/dial_num_pound_wht.png b/res/drawable-finger/dial_num_pound_wht.png
deleted file mode 100644 (file)
index 536332d..0000000
Binary files a/res/drawable-finger/dial_num_pound_wht.png and /dev/null differ
diff --git a/res/drawable-finger/dial_num_star_blk.png b/res/drawable-finger/dial_num_star_blk.png
deleted file mode 100644 (file)
index 81f0435..0000000
Binary files a/res/drawable-finger/dial_num_star_blk.png and /dev/null differ
diff --git a/res/drawable-finger/dial_num_star_wht.png b/res/drawable-finger/dial_num_star_wht.png
deleted file mode 100644 (file)
index f35548f..0000000
Binary files a/res/drawable-finger/dial_num_star_wht.png and /dev/null differ
diff --git a/res/drawable-finger/ic_delete_phone_number.xml b/res/drawable-finger/ic_delete_phone_number.xml
deleted file mode 100644 (file)
index adfc0ce..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" 
-        android:drawable="@drawable/ic_delete_phone_number_blk" />
-    <item android:state_focused="true"
-        android:drawable="@drawable/ic_delete_phone_number_blk" />
-    <item
-        android:drawable="@drawable/ic_delete_phone_number_wht" />
-</selector>
-
diff --git a/res/drawable-finger/ic_delete_phone_number_blk.png b/res/drawable-finger/ic_delete_phone_number_blk.png
deleted file mode 100644 (file)
index 2e83d36..0000000
Binary files a/res/drawable-finger/ic_delete_phone_number_blk.png and /dev/null differ
diff --git a/res/drawable-finger/ic_delete_phone_number_wht.png b/res/drawable-finger/ic_delete_phone_number_wht.png
deleted file mode 100644 (file)
index 988bcfd..0000000
Binary files a/res/drawable-finger/ic_delete_phone_number_wht.png and /dev/null differ
diff --git a/res/drawable-hdpi-finger/btn_dial_action_left_disable.9.png b/res/drawable-hdpi-finger/btn_dial_action_left_disable.9.png
new file mode 100644 (file)
index 0000000..7ba8672
Binary files /dev/null and b/res/drawable-hdpi-finger/btn_dial_action_left_disable.9.png differ
diff --git a/res/drawable-hdpi-finger/btn_dial_action_left_disable_focused.9.png b/res/drawable-hdpi-finger/btn_dial_action_left_disable_focused.9.png
new file mode 100644 (file)
index 0000000..b4300b6
Binary files /dev/null and b/res/drawable-hdpi-finger/btn_dial_action_left_disable_focused.9.png differ
diff --git a/res/drawable-hdpi-finger/btn_dial_action_left_normal.9.png b/res/drawable-hdpi-finger/btn_dial_action_left_normal.9.png
new file mode 100644 (file)
index 0000000..7ba8672
Binary files /dev/null and b/res/drawable-hdpi-finger/btn_dial_action_left_normal.9.png differ
diff --git a/res/drawable-hdpi-finger/btn_dial_action_left_pressed.9.png b/res/drawable-hdpi-finger/btn_dial_action_left_pressed.9.png
new file mode 100644 (file)
index 0000000..1dc40b7
Binary files /dev/null and b/res/drawable-hdpi-finger/btn_dial_action_left_pressed.9.png differ
diff --git a/res/drawable-hdpi-finger/btn_dial_action_left_selected.9.png b/res/drawable-hdpi-finger/btn_dial_action_left_selected.9.png
new file mode 100644 (file)
index 0000000..4f6c7cf
Binary files /dev/null and b/res/drawable-hdpi-finger/btn_dial_action_left_selected.9.png differ
diff --git a/res/drawable-hdpi-finger/btn_dial_action_middle_disable.9.png b/res/drawable-hdpi-finger/btn_dial_action_middle_disable.9.png
new file mode 100644 (file)
index 0000000..0a6cd66
Binary files /dev/null and b/res/drawable-hdpi-finger/btn_dial_action_middle_disable.9.png differ
diff --git a/res/drawable-hdpi-finger/btn_dial_action_middle_disable_focused.9.png b/res/drawable-hdpi-finger/btn_dial_action_middle_disable_focused.9.png
new file mode 100644 (file)
index 0000000..b28176f
Binary files /dev/null and b/res/drawable-hdpi-finger/btn_dial_action_middle_disable_focused.9.png differ
diff --git a/res/drawable-hdpi-finger/btn_dial_action_middle_normal.9.png b/res/drawable-hdpi-finger/btn_dial_action_middle_normal.9.png
new file mode 100644 (file)
index 0000000..0a6cd66
Binary files /dev/null and b/res/drawable-hdpi-finger/btn_dial_action_middle_normal.9.png differ
diff --git a/res/drawable-hdpi-finger/btn_dial_action_middle_pressed.9.png b/res/drawable-hdpi-finger/btn_dial_action_middle_pressed.9.png
new file mode 100644 (file)
index 0000000..58f187d
Binary files /dev/null and b/res/drawable-hdpi-finger/btn_dial_action_middle_pressed.9.png differ
diff --git a/res/drawable-hdpi-finger/btn_dial_action_middle_selected.9.png b/res/drawable-hdpi-finger/btn_dial_action_middle_selected.9.png
new file mode 100644 (file)
index 0000000..f201dee
Binary files /dev/null and b/res/drawable-hdpi-finger/btn_dial_action_middle_selected.9.png differ
diff --git a/res/drawable-hdpi-finger/btn_dial_action_right_disable.9.png b/res/drawable-hdpi-finger/btn_dial_action_right_disable.9.png
new file mode 100644 (file)
index 0000000..6e6fa30
Binary files /dev/null and b/res/drawable-hdpi-finger/btn_dial_action_right_disable.9.png differ
diff --git a/res/drawable-hdpi-finger/btn_dial_action_right_disable_focused.9.png b/res/drawable-hdpi-finger/btn_dial_action_right_disable_focused.9.png
new file mode 100644 (file)
index 0000000..46a042f
Binary files /dev/null and b/res/drawable-hdpi-finger/btn_dial_action_right_disable_focused.9.png differ
diff --git a/res/drawable-hdpi-finger/btn_dial_action_right_normal.9.png b/res/drawable-hdpi-finger/btn_dial_action_right_normal.9.png
new file mode 100644 (file)
index 0000000..6e6fa30
Binary files /dev/null and b/res/drawable-hdpi-finger/btn_dial_action_right_normal.9.png differ
diff --git a/res/drawable-hdpi-finger/btn_dial_action_right_pressed.9.png b/res/drawable-hdpi-finger/btn_dial_action_right_pressed.9.png
new file mode 100644 (file)
index 0000000..d66a509
Binary files /dev/null and b/res/drawable-hdpi-finger/btn_dial_action_right_pressed.9.png differ
diff --git a/res/drawable-hdpi-finger/btn_dial_action_right_selected.9.png b/res/drawable-hdpi-finger/btn_dial_action_right_selected.9.png
new file mode 100644 (file)
index 0000000..d2ee98b
Binary files /dev/null and b/res/drawable-hdpi-finger/btn_dial_action_right_selected.9.png differ
diff --git a/res/drawable-hdpi-finger/btn_dial_normal.9.png b/res/drawable-hdpi-finger/btn_dial_normal.9.png
new file mode 100644 (file)
index 0000000..5702e47
Binary files /dev/null and b/res/drawable-hdpi-finger/btn_dial_normal.9.png differ
diff --git a/res/drawable-hdpi-finger/btn_dial_normal_blue.9.png b/res/drawable-hdpi-finger/btn_dial_normal_blue.9.png
new file mode 100644 (file)
index 0000000..ddad155
Binary files /dev/null and b/res/drawable-hdpi-finger/btn_dial_normal_blue.9.png differ
diff --git a/res/drawable-hdpi-finger/btn_dial_normal_green.9.png b/res/drawable-hdpi-finger/btn_dial_normal_green.9.png
new file mode 100644 (file)
index 0000000..dbb0f97
Binary files /dev/null and b/res/drawable-hdpi-finger/btn_dial_normal_green.9.png differ
diff --git a/res/drawable-hdpi-finger/btn_dial_pressed.9.png b/res/drawable-hdpi-finger/btn_dial_pressed.9.png
new file mode 100644 (file)
index 0000000..a5b51d5
Binary files /dev/null and b/res/drawable-hdpi-finger/btn_dial_pressed.9.png differ
diff --git a/res/drawable-hdpi-finger/btn_dial_selected.9.png b/res/drawable-hdpi-finger/btn_dial_selected.9.png
new file mode 100644 (file)
index 0000000..b578146
Binary files /dev/null and b/res/drawable-hdpi-finger/btn_dial_selected.9.png differ
diff --git a/res/drawable-hdpi-finger/btn_dial_textfield_activated.9.png b/res/drawable-hdpi-finger/btn_dial_textfield_activated.9.png
new file mode 100644 (file)
index 0000000..c937c5e
Binary files /dev/null and b/res/drawable-hdpi-finger/btn_dial_textfield_activated.9.png differ
diff --git a/res/drawable-hdpi-finger/btn_dial_textfield_normal.9.png b/res/drawable-hdpi-finger/btn_dial_textfield_normal.9.png
new file mode 100644 (file)
index 0000000..0c38b39
Binary files /dev/null and b/res/drawable-hdpi-finger/btn_dial_textfield_normal.9.png differ
diff --git a/res/drawable-hdpi-finger/btn_dial_textfield_normal_full.9.png b/res/drawable-hdpi-finger/btn_dial_textfield_normal_full.9.png
new file mode 100644 (file)
index 0000000..05dd8b6
Binary files /dev/null and b/res/drawable-hdpi-finger/btn_dial_textfield_normal_full.9.png differ
diff --git a/res/drawable-hdpi-finger/btn_dial_textfield_normal_full_sm.9.png b/res/drawable-hdpi-finger/btn_dial_textfield_normal_full_sm.9.png
new file mode 100644 (file)
index 0000000..ea92feb
Binary files /dev/null and b/res/drawable-hdpi-finger/btn_dial_textfield_normal_full_sm.9.png differ
diff --git a/res/drawable-hdpi-finger/btn_dial_textfield_pressed.9.png b/res/drawable-hdpi-finger/btn_dial_textfield_pressed.9.png
new file mode 100644 (file)
index 0000000..22d8235
Binary files /dev/null and b/res/drawable-hdpi-finger/btn_dial_textfield_pressed.9.png differ
diff --git a/res/drawable-hdpi-finger/btn_dial_textfield_selected.9.png b/res/drawable-hdpi-finger/btn_dial_textfield_selected.9.png
new file mode 100644 (file)
index 0000000..1fe4dfc
Binary files /dev/null and b/res/drawable-hdpi-finger/btn_dial_textfield_selected.9.png differ
diff --git a/res/drawable-hdpi-finger/dial_num_0_blk.png b/res/drawable-hdpi-finger/dial_num_0_blk.png
new file mode 100644 (file)
index 0000000..960d968
Binary files /dev/null and b/res/drawable-hdpi-finger/dial_num_0_blk.png differ
diff --git a/res/drawable-hdpi-finger/dial_num_0_wht.png b/res/drawable-hdpi-finger/dial_num_0_wht.png
new file mode 100644 (file)
index 0000000..c257817
Binary files /dev/null and b/res/drawable-hdpi-finger/dial_num_0_wht.png differ
diff --git a/res/drawable-hdpi-finger/dial_num_1_no_vm_blk.png b/res/drawable-hdpi-finger/dial_num_1_no_vm_blk.png
new file mode 100644 (file)
index 0000000..d150354
Binary files /dev/null and b/res/drawable-hdpi-finger/dial_num_1_no_vm_blk.png differ
diff --git a/res/drawable-hdpi-finger/dial_num_1_no_vm_wht.png b/res/drawable-hdpi-finger/dial_num_1_no_vm_wht.png
new file mode 100644 (file)
index 0000000..9a1152b
Binary files /dev/null and b/res/drawable-hdpi-finger/dial_num_1_no_vm_wht.png differ
diff --git a/res/drawable-hdpi-finger/dial_num_2_blk.png b/res/drawable-hdpi-finger/dial_num_2_blk.png
new file mode 100644 (file)
index 0000000..7b0cee7
Binary files /dev/null and b/res/drawable-hdpi-finger/dial_num_2_blk.png differ
diff --git a/res/drawable-hdpi-finger/dial_num_2_wht.png b/res/drawable-hdpi-finger/dial_num_2_wht.png
new file mode 100644 (file)
index 0000000..cad5485
Binary files /dev/null and b/res/drawable-hdpi-finger/dial_num_2_wht.png differ
diff --git a/res/drawable-hdpi-finger/dial_num_3_blk.png b/res/drawable-hdpi-finger/dial_num_3_blk.png
new file mode 100644 (file)
index 0000000..d2efe88
Binary files /dev/null and b/res/drawable-hdpi-finger/dial_num_3_blk.png differ
diff --git a/res/drawable-hdpi-finger/dial_num_3_wht.png b/res/drawable-hdpi-finger/dial_num_3_wht.png
new file mode 100644 (file)
index 0000000..ddb890c
Binary files /dev/null and b/res/drawable-hdpi-finger/dial_num_3_wht.png differ
diff --git a/res/drawable-hdpi-finger/dial_num_4_blk.png b/res/drawable-hdpi-finger/dial_num_4_blk.png
new file mode 100644 (file)
index 0000000..fc3ed43
Binary files /dev/null and b/res/drawable-hdpi-finger/dial_num_4_blk.png differ
diff --git a/res/drawable-hdpi-finger/dial_num_4_wht.png b/res/drawable-hdpi-finger/dial_num_4_wht.png
new file mode 100644 (file)
index 0000000..bb8064c
Binary files /dev/null and b/res/drawable-hdpi-finger/dial_num_4_wht.png differ
diff --git a/res/drawable-hdpi-finger/dial_num_5_blk.png b/res/drawable-hdpi-finger/dial_num_5_blk.png
new file mode 100644 (file)
index 0000000..5c78c75
Binary files /dev/null and b/res/drawable-hdpi-finger/dial_num_5_blk.png differ
diff --git a/res/drawable-hdpi-finger/dial_num_5_wht.png b/res/drawable-hdpi-finger/dial_num_5_wht.png
new file mode 100644 (file)
index 0000000..1368d36
Binary files /dev/null and b/res/drawable-hdpi-finger/dial_num_5_wht.png differ
diff --git a/res/drawable-hdpi-finger/dial_num_6_blk.png b/res/drawable-hdpi-finger/dial_num_6_blk.png
new file mode 100644 (file)
index 0000000..583fb2a
Binary files /dev/null and b/res/drawable-hdpi-finger/dial_num_6_blk.png differ
diff --git a/res/drawable-hdpi-finger/dial_num_6_wht.png b/res/drawable-hdpi-finger/dial_num_6_wht.png
new file mode 100644 (file)
index 0000000..7f1bf4a
Binary files /dev/null and b/res/drawable-hdpi-finger/dial_num_6_wht.png differ
diff --git a/res/drawable-hdpi-finger/dial_num_7_blk.png b/res/drawable-hdpi-finger/dial_num_7_blk.png
new file mode 100644 (file)
index 0000000..793660b
Binary files /dev/null and b/res/drawable-hdpi-finger/dial_num_7_blk.png differ
diff --git a/res/drawable-hdpi-finger/dial_num_7_wht.png b/res/drawable-hdpi-finger/dial_num_7_wht.png
new file mode 100644 (file)
index 0000000..d8038c7
Binary files /dev/null and b/res/drawable-hdpi-finger/dial_num_7_wht.png differ
diff --git a/res/drawable-hdpi-finger/dial_num_8_blk.png b/res/drawable-hdpi-finger/dial_num_8_blk.png
new file mode 100644 (file)
index 0000000..0ee87fe
Binary files /dev/null and b/res/drawable-hdpi-finger/dial_num_8_blk.png differ
diff --git a/res/drawable-hdpi-finger/dial_num_8_wht.png b/res/drawable-hdpi-finger/dial_num_8_wht.png
new file mode 100644 (file)
index 0000000..9d0d0eb
Binary files /dev/null and b/res/drawable-hdpi-finger/dial_num_8_wht.png differ
diff --git a/res/drawable-hdpi-finger/dial_num_9_blk.png b/res/drawable-hdpi-finger/dial_num_9_blk.png
new file mode 100644 (file)
index 0000000..920235a
Binary files /dev/null and b/res/drawable-hdpi-finger/dial_num_9_blk.png differ
diff --git a/res/drawable-hdpi-finger/dial_num_9_wht.png b/res/drawable-hdpi-finger/dial_num_9_wht.png
new file mode 100644 (file)
index 0000000..ac3727d
Binary files /dev/null and b/res/drawable-hdpi-finger/dial_num_9_wht.png differ
diff --git a/res/drawable-hdpi-finger/dial_num_pound_blk.png b/res/drawable-hdpi-finger/dial_num_pound_blk.png
new file mode 100644 (file)
index 0000000..fcfc58c
Binary files /dev/null and b/res/drawable-hdpi-finger/dial_num_pound_blk.png differ
diff --git a/res/drawable-hdpi-finger/dial_num_pound_wht.png b/res/drawable-hdpi-finger/dial_num_pound_wht.png
new file mode 100644 (file)
index 0000000..df67810
Binary files /dev/null and b/res/drawable-hdpi-finger/dial_num_pound_wht.png differ
diff --git a/res/drawable-hdpi-finger/dial_num_star_blk.png b/res/drawable-hdpi-finger/dial_num_star_blk.png
new file mode 100644 (file)
index 0000000..ddda118
Binary files /dev/null and b/res/drawable-hdpi-finger/dial_num_star_blk.png differ
diff --git a/res/drawable-hdpi-finger/dial_num_star_wht.png b/res/drawable-hdpi-finger/dial_num_star_wht.png
new file mode 100644 (file)
index 0000000..ded1900
Binary files /dev/null and b/res/drawable-hdpi-finger/dial_num_star_wht.png differ
diff --git a/res/drawable-hdpi-finger/ic_dial_action_call.png b/res/drawable-hdpi-finger/ic_dial_action_call.png
new file mode 100644 (file)
index 0000000..1ba3a98
Binary files /dev/null and b/res/drawable-hdpi-finger/ic_dial_action_call.png differ
diff --git a/res/drawable-hdpi-finger/ic_dial_action_delete.png b/res/drawable-hdpi-finger/ic_dial_action_delete.png
new file mode 100644 (file)
index 0000000..2e206c8
Binary files /dev/null and b/res/drawable-hdpi-finger/ic_dial_action_delete.png differ
diff --git a/res/drawable-hdpi-finger/ic_dial_action_voice_mail.png b/res/drawable-hdpi-finger/ic_dial_action_voice_mail.png
new file mode 100644 (file)
index 0000000..8a3f366
Binary files /dev/null and b/res/drawable-hdpi-finger/ic_dial_action_voice_mail.png differ
diff --git a/res/drawable-hdpi-finger/ic_dial_number_blk.png b/res/drawable-hdpi-finger/ic_dial_number_blk.png
new file mode 100644 (file)
index 0000000..788af90
Binary files /dev/null and b/res/drawable-hdpi-finger/ic_dial_number_blk.png differ
diff --git a/res/drawable-hdpi-finger/ic_dial_number_wht.png b/res/drawable-hdpi-finger/ic_dial_number_wht.png
new file mode 100644 (file)
index 0000000..4bcbdbb
Binary files /dev/null and b/res/drawable-hdpi-finger/ic_dial_number_wht.png differ
diff --git a/res/drawable-hdpi-finger/ic_menu_contact.png b/res/drawable-hdpi-finger/ic_menu_contact.png
new file mode 100644 (file)
index 0000000..6afda6c
Binary files /dev/null and b/res/drawable-hdpi-finger/ic_menu_contact.png differ
diff --git a/res/drawable-hdpi-finger/ic_tab_selected_contacts.png b/res/drawable-hdpi-finger/ic_tab_selected_contacts.png
new file mode 100644 (file)
index 0000000..16ac2b4
Binary files /dev/null and b/res/drawable-hdpi-finger/ic_tab_selected_contacts.png differ
diff --git a/res/drawable-hdpi-finger/ic_tab_selected_dialer.png b/res/drawable-hdpi-finger/ic_tab_selected_dialer.png
new file mode 100644 (file)
index 0000000..7fcd2c8
Binary files /dev/null and b/res/drawable-hdpi-finger/ic_tab_selected_dialer.png differ
diff --git a/res/drawable-hdpi-finger/ic_tab_selected_recent.png b/res/drawable-hdpi-finger/ic_tab_selected_recent.png
new file mode 100644 (file)
index 0000000..9b0eee3
Binary files /dev/null and b/res/drawable-hdpi-finger/ic_tab_selected_recent.png differ
diff --git a/res/drawable-hdpi-finger/ic_tab_selected_stared.png b/res/drawable-hdpi-finger/ic_tab_selected_stared.png
new file mode 100644 (file)
index 0000000..be8be5e
Binary files /dev/null and b/res/drawable-hdpi-finger/ic_tab_selected_stared.png differ
diff --git a/res/drawable-hdpi-finger/ic_tab_unselected_contacts.png b/res/drawable-hdpi-finger/ic_tab_unselected_contacts.png
new file mode 100644 (file)
index 0000000..17ef42d
Binary files /dev/null and b/res/drawable-hdpi-finger/ic_tab_unselected_contacts.png differ
diff --git a/res/drawable-hdpi-finger/ic_tab_unselected_dialer.png b/res/drawable-hdpi-finger/ic_tab_unselected_dialer.png
new file mode 100644 (file)
index 0000000..b86e17b
Binary files /dev/null and b/res/drawable-hdpi-finger/ic_tab_unselected_dialer.png differ
diff --git a/res/drawable-hdpi-finger/ic_tab_unselected_recent.png b/res/drawable-hdpi-finger/ic_tab_unselected_recent.png
new file mode 100644 (file)
index 0000000..bcdd417
Binary files /dev/null and b/res/drawable-hdpi-finger/ic_tab_unselected_recent.png differ
diff --git a/res/drawable-hdpi-finger/ic_tab_unselected_stared.png b/res/drawable-hdpi-finger/ic_tab_unselected_stared.png
new file mode 100644 (file)
index 0000000..01bc334
Binary files /dev/null and b/res/drawable-hdpi-finger/ic_tab_unselected_stared.png differ
diff --git a/res/drawable-hdpi/bg_in_call_gradient_bluetooth.9.png b/res/drawable-hdpi/bg_in_call_gradient_bluetooth.9.png
new file mode 100755 (executable)
index 0000000..20b13e8
Binary files /dev/null and b/res/drawable-hdpi/bg_in_call_gradient_bluetooth.9.png differ
diff --git a/res/drawable-hdpi/bg_in_call_gradient_connected.9.png b/res/drawable-hdpi/bg_in_call_gradient_connected.9.png
new file mode 100755 (executable)
index 0000000..a4974cd
Binary files /dev/null and b/res/drawable-hdpi/bg_in_call_gradient_connected.9.png differ
diff --git a/res/drawable-hdpi/bg_in_call_gradient_ended.9.png b/res/drawable-hdpi/bg_in_call_gradient_ended.9.png
new file mode 100755 (executable)
index 0000000..ead572f
Binary files /dev/null and b/res/drawable-hdpi/bg_in_call_gradient_ended.9.png differ
diff --git a/res/drawable-hdpi/bg_in_call_gradient_on_hold.9.png b/res/drawable-hdpi/bg_in_call_gradient_on_hold.9.png
new file mode 100755 (executable)
index 0000000..4b65018
Binary files /dev/null and b/res/drawable-hdpi/bg_in_call_gradient_on_hold.9.png differ
diff --git a/res/drawable-hdpi/bg_in_call_gradient_unidentified.9.png b/res/drawable-hdpi/bg_in_call_gradient_unidentified.9.png
new file mode 100755 (executable)
index 0000000..7d04eb5
Binary files /dev/null and b/res/drawable-hdpi/bg_in_call_gradient_unidentified.9.png differ
diff --git a/res/drawable-hdpi/btn_in_call_answer_dotted_green.9.png b/res/drawable-hdpi/btn_in_call_answer_dotted_green.9.png
new file mode 100755 (executable)
index 0000000..d19571e
Binary files /dev/null and b/res/drawable-hdpi/btn_in_call_answer_dotted_green.9.png differ
diff --git a/res/drawable-hdpi/btn_in_call_answer_dotted_red.9.png b/res/drawable-hdpi/btn_in_call_answer_dotted_red.9.png
new file mode 100755 (executable)
index 0000000..59efaab
Binary files /dev/null and b/res/drawable-hdpi/btn_in_call_answer_dotted_red.9.png differ
diff --git a/res/drawable-hdpi/btn_in_call_answer_normal.9.png b/res/drawable-hdpi/btn_in_call_answer_normal.9.png
new file mode 100755 (executable)
index 0000000..d975434
Binary files /dev/null and b/res/drawable-hdpi/btn_in_call_answer_normal.9.png differ
diff --git a/res/drawable-hdpi/btn_in_call_answer_pressed.9.png b/res/drawable-hdpi/btn_in_call_answer_pressed.9.png
new file mode 100755 (executable)
index 0000000..ead97ab
Binary files /dev/null and b/res/drawable-hdpi/btn_in_call_answer_pressed.9.png differ
diff --git a/res/drawable-hdpi/btn_in_call_main_disable.9.png b/res/drawable-hdpi/btn_in_call_main_disable.9.png
new file mode 100755 (executable)
index 0000000..1a8bb4e
Binary files /dev/null and b/res/drawable-hdpi/btn_in_call_main_disable.9.png differ
diff --git a/res/drawable-hdpi/btn_in_call_main_disable_focused.9.png b/res/drawable-hdpi/btn_in_call_main_disable_focused.9.png
new file mode 100755 (executable)
index 0000000..8dfc4cf
Binary files /dev/null and b/res/drawable-hdpi/btn_in_call_main_disable_focused.9.png differ
diff --git a/res/drawable-hdpi/btn_in_call_main_normal.9.png b/res/drawable-hdpi/btn_in_call_main_normal.9.png
new file mode 100755 (executable)
index 0000000..1a8bb4e
Binary files /dev/null and b/res/drawable-hdpi/btn_in_call_main_normal.9.png differ
diff --git a/res/drawable-hdpi/btn_in_call_main_pressed.9.png b/res/drawable-hdpi/btn_in_call_main_pressed.9.png
new file mode 100755 (executable)
index 0000000..46766eb
Binary files /dev/null and b/res/drawable-hdpi/btn_in_call_main_pressed.9.png differ
diff --git a/res/drawable-hdpi/btn_in_call_main_selected.9.png b/res/drawable-hdpi/btn_in_call_main_selected.9.png
new file mode 100755 (executable)
index 0000000..56a1850
Binary files /dev/null and b/res/drawable-hdpi/btn_in_call_main_selected.9.png differ
diff --git a/res/drawable-hdpi/btn_in_call_manage_conf_normal.9.png b/res/drawable-hdpi/btn_in_call_manage_conf_normal.9.png
new file mode 100755 (executable)
index 0000000..2368b55
Binary files /dev/null and b/res/drawable-hdpi/btn_in_call_manage_conf_normal.9.png differ
diff --git a/res/drawable-hdpi/btn_in_call_manage_conf_pressed.9.png b/res/drawable-hdpi/btn_in_call_manage_conf_pressed.9.png
new file mode 100755 (executable)
index 0000000..9825031
Binary files /dev/null and b/res/drawable-hdpi/btn_in_call_manage_conf_pressed.9.png differ
diff --git a/res/drawable-hdpi/btn_in_call_manage_conf_selected.9.png b/res/drawable-hdpi/btn_in_call_manage_conf_selected.9.png
new file mode 100755 (executable)
index 0000000..9e409da
Binary files /dev/null and b/res/drawable-hdpi/btn_in_call_manage_conf_selected.9.png differ
diff --git a/res/drawable-hdpi/btn_in_call_round_disable.png b/res/drawable-hdpi/btn_in_call_round_disable.png
new file mode 100755 (executable)
index 0000000..0591d51
Binary files /dev/null and b/res/drawable-hdpi/btn_in_call_round_disable.png differ
diff --git a/res/drawable-hdpi/btn_in_call_round_disable_focused.png b/res/drawable-hdpi/btn_in_call_round_disable_focused.png
new file mode 100755 (executable)
index 0000000..1b870ac
Binary files /dev/null and b/res/drawable-hdpi/btn_in_call_round_disable_focused.png differ
diff --git a/res/drawable-hdpi/btn_in_call_round_normal.png b/res/drawable-hdpi/btn_in_call_round_normal.png
new file mode 100755 (executable)
index 0000000..9182f3f
Binary files /dev/null and b/res/drawable-hdpi/btn_in_call_round_normal.png differ
diff --git a/res/drawable-hdpi/btn_in_call_round_pressed.png b/res/drawable-hdpi/btn_in_call_round_pressed.png
new file mode 100755 (executable)
index 0000000..7d47a84
Binary files /dev/null and b/res/drawable-hdpi/btn_in_call_round_pressed.png differ
diff --git a/res/drawable-hdpi/btn_in_call_round_selected.png b/res/drawable-hdpi/btn_in_call_round_selected.png
new file mode 100755 (executable)
index 0000000..1f6846a
Binary files /dev/null and b/res/drawable-hdpi/btn_in_call_round_selected.png differ
diff --git a/res/drawable-hdpi/btn_in_call_switch_off_disable.9.png b/res/drawable-hdpi/btn_in_call_switch_off_disable.9.png
new file mode 100755 (executable)
index 0000000..59eaff8
Binary files /dev/null and b/res/drawable-hdpi/btn_in_call_switch_off_disable.9.png differ
diff --git a/res/drawable-hdpi/btn_in_call_switch_off_disable_focused.9.png b/res/drawable-hdpi/btn_in_call_switch_off_disable_focused.9.png
new file mode 100755 (executable)
index 0000000..2a6aaba
Binary files /dev/null and b/res/drawable-hdpi/btn_in_call_switch_off_disable_focused.9.png differ
diff --git a/res/drawable-hdpi/btn_in_call_switch_off_normal.9.png b/res/drawable-hdpi/btn_in_call_switch_off_normal.9.png
new file mode 100755 (executable)
index 0000000..c16e23b
Binary files /dev/null and b/res/drawable-hdpi/btn_in_call_switch_off_normal.9.png differ
diff --git a/res/drawable-hdpi/btn_in_call_switch_off_pressed.9.png b/res/drawable-hdpi/btn_in_call_switch_off_pressed.9.png
new file mode 100755 (executable)
index 0000000..194009f
Binary files /dev/null and b/res/drawable-hdpi/btn_in_call_switch_off_pressed.9.png differ
diff --git a/res/drawable-hdpi/btn_in_call_switch_off_selected.9.png b/res/drawable-hdpi/btn_in_call_switch_off_selected.9.png
new file mode 100755 (executable)
index 0000000..79d5d9d
Binary files /dev/null and b/res/drawable-hdpi/btn_in_call_switch_off_selected.9.png differ
diff --git a/res/drawable-hdpi/btn_in_call_switch_on_disable.9.png b/res/drawable-hdpi/btn_in_call_switch_on_disable.9.png
new file mode 100755 (executable)
index 0000000..979b87a
Binary files /dev/null and b/res/drawable-hdpi/btn_in_call_switch_on_disable.9.png differ
diff --git a/res/drawable-hdpi/btn_in_call_switch_on_disable_focused.9.png b/res/drawable-hdpi/btn_in_call_switch_on_disable_focused.9.png
new file mode 100755 (executable)
index 0000000..c7e20f5
Binary files /dev/null and b/res/drawable-hdpi/btn_in_call_switch_on_disable_focused.9.png differ
diff --git a/res/drawable-hdpi/btn_in_call_switch_on_normal.9.png b/res/drawable-hdpi/btn_in_call_switch_on_normal.9.png
new file mode 100755 (executable)
index 0000000..fbed2d0
Binary files /dev/null and b/res/drawable-hdpi/btn_in_call_switch_on_normal.9.png differ
diff --git a/res/drawable-hdpi/btn_in_call_switch_on_pressed.9.png b/res/drawable-hdpi/btn_in_call_switch_on_pressed.9.png
new file mode 100755 (executable)
index 0000000..6c2f3ae
Binary files /dev/null and b/res/drawable-hdpi/btn_in_call_switch_on_pressed.9.png differ
diff --git a/res/drawable-hdpi/btn_in_call_switch_on_selected.9.png b/res/drawable-hdpi/btn_in_call_switch_on_selected.9.png
new file mode 100755 (executable)
index 0000000..99e4bc9
Binary files /dev/null and b/res/drawable-hdpi/btn_in_call_switch_on_selected.9.png differ
diff --git a/res/drawable-hdpi/dialog_bg_calling_via.9.png b/res/drawable-hdpi/dialog_bg_calling_via.9.png
new file mode 100644 (file)
index 0000000..ab5ded7
Binary files /dev/null and b/res/drawable-hdpi/dialog_bg_calling_via.9.png differ
diff --git a/res/drawable-hdpi/green_selected.9.png b/res/drawable-hdpi/green_selected.9.png
new file mode 100644 (file)
index 0000000..3983e85
Binary files /dev/null and b/res/drawable-hdpi/green_selected.9.png differ
diff --git a/res/drawable-hdpi/ic_button_conference_end.png b/res/drawable-hdpi/ic_button_conference_end.png
new file mode 100644 (file)
index 0000000..a075999
Binary files /dev/null and b/res/drawable-hdpi/ic_button_conference_end.png differ
diff --git a/res/drawable-hdpi/ic_button_conference_private.png b/res/drawable-hdpi/ic_button_conference_private.png
new file mode 100644 (file)
index 0000000..7609089
Binary files /dev/null and b/res/drawable-hdpi/ic_button_conference_private.png differ
diff --git a/res/drawable-hdpi/ic_button_contacts.png b/res/drawable-hdpi/ic_button_contacts.png
new file mode 100644 (file)
index 0000000..04f065c
Binary files /dev/null and b/res/drawable-hdpi/ic_button_contacts.png differ
diff --git a/res/drawable-hdpi/ic_dialog_call.png b/res/drawable-hdpi/ic_dialog_call.png
new file mode 100644 (file)
index 0000000..0531e31
Binary files /dev/null and b/res/drawable-hdpi/ic_dialog_call.png differ
diff --git a/res/drawable-hdpi/ic_in_call_touch_add_call.png b/res/drawable-hdpi/ic_in_call_touch_add_call.png
new file mode 100755 (executable)
index 0000000..a8a49a3
Binary files /dev/null and b/res/drawable-hdpi/ic_in_call_touch_add_call.png differ
diff --git a/res/drawable-hdpi/ic_in_call_touch_answer.png b/res/drawable-hdpi/ic_in_call_touch_answer.png
new file mode 100755 (executable)
index 0000000..e93733e
Binary files /dev/null and b/res/drawable-hdpi/ic_in_call_touch_answer.png differ
diff --git a/res/drawable-hdpi/ic_in_call_touch_dialpad.png b/res/drawable-hdpi/ic_in_call_touch_dialpad.png
new file mode 100755 (executable)
index 0000000..def2bdb
Binary files /dev/null and b/res/drawable-hdpi/ic_in_call_touch_dialpad.png differ
diff --git a/res/drawable-hdpi/ic_in_call_touch_dialpad_close.png b/res/drawable-hdpi/ic_in_call_touch_dialpad_close.png
new file mode 100755 (executable)
index 0000000..930cfa4
Binary files /dev/null and b/res/drawable-hdpi/ic_in_call_touch_dialpad_close.png differ
diff --git a/res/drawable-hdpi/ic_in_call_touch_end.png b/res/drawable-hdpi/ic_in_call_touch_end.png
new file mode 100755 (executable)
index 0000000..1675013
Binary files /dev/null and b/res/drawable-hdpi/ic_in_call_touch_end.png differ
diff --git a/res/drawable-hdpi/ic_in_call_touch_hold.png b/res/drawable-hdpi/ic_in_call_touch_hold.png
new file mode 100755 (executable)
index 0000000..8adf7a5
Binary files /dev/null and b/res/drawable-hdpi/ic_in_call_touch_hold.png differ
diff --git a/res/drawable-hdpi/ic_in_call_touch_merge_call.png b/res/drawable-hdpi/ic_in_call_touch_merge_call.png
new file mode 100755 (executable)
index 0000000..343e8ff
Binary files /dev/null and b/res/drawable-hdpi/ic_in_call_touch_merge_call.png differ
diff --git a/res/drawable-hdpi/ic_in_call_touch_round_add_call.png b/res/drawable-hdpi/ic_in_call_touch_round_add_call.png
new file mode 100755 (executable)
index 0000000..a913b32
Binary files /dev/null and b/res/drawable-hdpi/ic_in_call_touch_round_add_call.png differ
diff --git a/res/drawable-hdpi/ic_in_call_touch_round_hold.png b/res/drawable-hdpi/ic_in_call_touch_round_hold.png
new file mode 100755 (executable)
index 0000000..629d28b
Binary files /dev/null and b/res/drawable-hdpi/ic_in_call_touch_round_hold.png differ
diff --git a/res/drawable-hdpi/ic_in_call_touch_round_manage_conference.png b/res/drawable-hdpi/ic_in_call_touch_round_manage_conference.png
new file mode 100755 (executable)
index 0000000..5185d00
Binary files /dev/null and b/res/drawable-hdpi/ic_in_call_touch_round_manage_conference.png differ
diff --git a/res/drawable-hdpi/ic_in_call_touch_round_merge_call.png b/res/drawable-hdpi/ic_in_call_touch_round_merge_call.png
new file mode 100755 (executable)
index 0000000..dd16a7e
Binary files /dev/null and b/res/drawable-hdpi/ic_in_call_touch_round_merge_call.png differ
diff --git a/res/drawable-hdpi/ic_in_call_touch_round_swap.png b/res/drawable-hdpi/ic_in_call_touch_round_swap.png
new file mode 100755 (executable)
index 0000000..2405b14
Binary files /dev/null and b/res/drawable-hdpi/ic_in_call_touch_round_swap.png differ
diff --git a/res/drawable-hdpi/ic_in_call_touch_round_unhold.png b/res/drawable-hdpi/ic_in_call_touch_round_unhold.png
new file mode 100755 (executable)
index 0000000..76b42f9
Binary files /dev/null and b/res/drawable-hdpi/ic_in_call_touch_round_unhold.png differ
diff --git a/res/drawable-hdpi/ic_in_call_touch_round_unhold_alt.png b/res/drawable-hdpi/ic_in_call_touch_round_unhold_alt.png
new file mode 100755 (executable)
index 0000000..c72c973
Binary files /dev/null and b/res/drawable-hdpi/ic_in_call_touch_round_unhold_alt.png differ
diff --git a/res/drawable-hdpi/ic_in_call_touch_swap.png b/res/drawable-hdpi/ic_in_call_touch_swap.png
new file mode 100755 (executable)
index 0000000..cd6db27
Binary files /dev/null and b/res/drawable-hdpi/ic_in_call_touch_swap.png differ
diff --git a/res/drawable-hdpi/ic_in_call_touch_unhold.png b/res/drawable-hdpi/ic_in_call_touch_unhold.png
new file mode 100755 (executable)
index 0000000..623d61c
Binary files /dev/null and b/res/drawable-hdpi/ic_in_call_touch_unhold.png differ
diff --git a/res/drawable-hdpi/ic_incall_end.png b/res/drawable-hdpi/ic_incall_end.png
new file mode 100644 (file)
index 0000000..ee50472
Binary files /dev/null and b/res/drawable-hdpi/ic_incall_end.png differ
diff --git a/res/drawable-hdpi/ic_incall_ongoing.png b/res/drawable-hdpi/ic_incall_ongoing.png
new file mode 100644 (file)
index 0000000..e79158f
Binary files /dev/null and b/res/drawable-hdpi/ic_incall_ongoing.png differ
diff --git a/res/drawable-hdpi/ic_incall_ongoing_bluetooth.png b/res/drawable-hdpi/ic_incall_ongoing_bluetooth.png
new file mode 100644 (file)
index 0000000..a8f868e
Binary files /dev/null and b/res/drawable-hdpi/ic_incall_ongoing_bluetooth.png differ
diff --git a/res/drawable-hdpi/ic_incall_onhold.png b/res/drawable-hdpi/ic_incall_onhold.png
new file mode 100644 (file)
index 0000000..67deef6
Binary files /dev/null and b/res/drawable-hdpi/ic_incall_onhold.png differ
diff --git a/res/drawable-hdpi/ic_incoming_call_bluetooth.png b/res/drawable-hdpi/ic_incoming_call_bluetooth.png
new file mode 100644 (file)
index 0000000..050c3e7
Binary files /dev/null and b/res/drawable-hdpi/ic_incoming_call_bluetooth.png differ
diff --git a/res/drawable-hdpi/ic_jog_dial_answer.png b/res/drawable-hdpi/ic_jog_dial_answer.png
new file mode 100755 (executable)
index 0000000..ca0a825
Binary files /dev/null and b/res/drawable-hdpi/ic_jog_dial_answer.png differ
diff --git a/res/drawable-hdpi/ic_jog_dial_answer_and_end.png b/res/drawable-hdpi/ic_jog_dial_answer_and_end.png
new file mode 100755 (executable)
index 0000000..82237bd
Binary files /dev/null and b/res/drawable-hdpi/ic_jog_dial_answer_and_end.png differ
diff --git a/res/drawable-hdpi/ic_jog_dial_answer_and_hold.png b/res/drawable-hdpi/ic_jog_dial_answer_and_hold.png
new file mode 100755 (executable)
index 0000000..4946ada
Binary files /dev/null and b/res/drawable-hdpi/ic_jog_dial_answer_and_hold.png differ
diff --git a/res/drawable-hdpi/ic_jog_dial_decline.png b/res/drawable-hdpi/ic_jog_dial_decline.png
new file mode 100755 (executable)
index 0000000..006a6e4
Binary files /dev/null and b/res/drawable-hdpi/ic_jog_dial_decline.png differ
diff --git a/res/drawable-hdpi/ic_jog_dial_silence_ringer.png b/res/drawable-hdpi/ic_jog_dial_silence_ringer.png
new file mode 100755 (executable)
index 0000000..cef67bd
Binary files /dev/null and b/res/drawable-hdpi/ic_jog_dial_silence_ringer.png differ
diff --git a/res/drawable-hdpi/ic_jog_dial_sound_off.png b/res/drawable-hdpi/ic_jog_dial_sound_off.png
new file mode 100755 (executable)
index 0000000..d73db48
Binary files /dev/null and b/res/drawable-hdpi/ic_jog_dial_sound_off.png differ
diff --git a/res/drawable-hdpi/ic_jog_dial_sound_on.png b/res/drawable-hdpi/ic_jog_dial_sound_on.png
new file mode 100755 (executable)
index 0000000..90da6e3
Binary files /dev/null and b/res/drawable-hdpi/ic_jog_dial_sound_on.png differ
diff --git a/res/drawable-hdpi/ic_jog_dial_unlock.png b/res/drawable-hdpi/ic_jog_dial_unlock.png
new file mode 100755 (executable)
index 0000000..a9af1af
Binary files /dev/null and b/res/drawable-hdpi/ic_jog_dial_unlock.png differ
diff --git a/res/drawable-hdpi/ic_jog_dial_voice_search.png b/res/drawable-hdpi/ic_jog_dial_voice_search.png
new file mode 100755 (executable)
index 0000000..4009a34
Binary files /dev/null and b/res/drawable-hdpi/ic_jog_dial_voice_search.png differ
diff --git a/res/drawable-hdpi/ic_launcher_phone.png b/res/drawable-hdpi/ic_launcher_phone.png
new file mode 100644 (file)
index 0000000..0943ce5
Binary files /dev/null and b/res/drawable-hdpi/ic_launcher_phone.png differ
diff --git a/res/drawable-hdpi/ic_menu_answer_call.png b/res/drawable-hdpi/ic_menu_answer_call.png
new file mode 100644 (file)
index 0000000..e0bee0b
Binary files /dev/null and b/res/drawable-hdpi/ic_menu_answer_call.png differ
diff --git a/res/drawable-hdpi/ic_menu_dial_pad.png b/res/drawable-hdpi/ic_menu_dial_pad.png
new file mode 100644 (file)
index 0000000..6eb406a
Binary files /dev/null and b/res/drawable-hdpi/ic_menu_dial_pad.png differ
diff --git a/res/drawable-hdpi/ic_menu_end_call.png b/res/drawable-hdpi/ic_menu_end_call.png
new file mode 100644 (file)
index 0000000..aff4c52
Binary files /dev/null and b/res/drawable-hdpi/ic_menu_end_call.png differ
diff --git a/res/drawable-hdpi/ic_menu_merge_calls.png b/res/drawable-hdpi/ic_menu_merge_calls.png
new file mode 100644 (file)
index 0000000..6646899
Binary files /dev/null and b/res/drawable-hdpi/ic_menu_merge_calls.png differ
diff --git a/res/drawable-hdpi/ic_menu_silence_ringer.png b/res/drawable-hdpi/ic_menu_silence_ringer.png
new file mode 100644 (file)
index 0000000..e09ed9f
Binary files /dev/null and b/res/drawable-hdpi/ic_menu_silence_ringer.png differ
diff --git a/res/drawable-hdpi/ic_menu_swap_calls.png b/res/drawable-hdpi/ic_menu_swap_calls.png
new file mode 100644 (file)
index 0000000..36deb05
Binary files /dev/null and b/res/drawable-hdpi/ic_menu_swap_calls.png differ
diff --git a/res/drawable-hdpi/incall_photo_border_lg.9.png b/res/drawable-hdpi/incall_photo_border_lg.9.png
new file mode 100755 (executable)
index 0000000..351df2d
Binary files /dev/null and b/res/drawable-hdpi/incall_photo_border_lg.9.png differ
diff --git a/res/drawable-hdpi/incall_photo_border_med.9.png b/res/drawable-hdpi/incall_photo_border_med.9.png
new file mode 100755 (executable)
index 0000000..395c85c
Binary files /dev/null and b/res/drawable-hdpi/incall_photo_border_med.9.png differ
diff --git a/res/drawable-hdpi/picture_busy.png b/res/drawable-hdpi/picture_busy.png
new file mode 100644 (file)
index 0000000..98deacf
Binary files /dev/null and b/res/drawable-hdpi/picture_busy.png differ
diff --git a/res/drawable-hdpi/picture_conference.png b/res/drawable-hdpi/picture_conference.png
new file mode 100644 (file)
index 0000000..33211bb
Binary files /dev/null and b/res/drawable-hdpi/picture_conference.png differ
diff --git a/res/drawable-hdpi/picture_dialing.png b/res/drawable-hdpi/picture_dialing.png
new file mode 100644 (file)
index 0000000..0099598
Binary files /dev/null and b/res/drawable-hdpi/picture_dialing.png differ
diff --git a/res/drawable-hdpi/picture_unknown.png b/res/drawable-hdpi/picture_unknown.png
new file mode 100644 (file)
index 0000000..00d9e24
Binary files /dev/null and b/res/drawable-hdpi/picture_unknown.png differ
diff --git a/res/drawable-hdpi/red_selected.9.png b/res/drawable-hdpi/red_selected.9.png
new file mode 100644 (file)
index 0000000..235519b
Binary files /dev/null and b/res/drawable-hdpi/red_selected.9.png differ
diff --git a/res/drawable-land/ic_incoming_call_bluetooth.png b/res/drawable-land/ic_incoming_call_bluetooth.png
deleted file mode 100644 (file)
index c076891..0000000
Binary files a/res/drawable-land/ic_incoming_call_bluetooth.png and /dev/null differ
diff --git a/res/drawable-mdpi-finger/btn_dial_action_left_disable.9.png b/res/drawable-mdpi-finger/btn_dial_action_left_disable.9.png
new file mode 100644 (file)
index 0000000..6ab27d8
Binary files /dev/null and b/res/drawable-mdpi-finger/btn_dial_action_left_disable.9.png differ
diff --git a/res/drawable-mdpi-finger/btn_dial_action_left_disable_focused.9.png b/res/drawable-mdpi-finger/btn_dial_action_left_disable_focused.9.png
new file mode 100644 (file)
index 0000000..5bba3c4
Binary files /dev/null and b/res/drawable-mdpi-finger/btn_dial_action_left_disable_focused.9.png differ
diff --git a/res/drawable-mdpi-finger/btn_dial_action_left_normal.9.png b/res/drawable-mdpi-finger/btn_dial_action_left_normal.9.png
new file mode 100644 (file)
index 0000000..6ab27d8
Binary files /dev/null and b/res/drawable-mdpi-finger/btn_dial_action_left_normal.9.png differ
diff --git a/res/drawable-mdpi-finger/btn_dial_action_left_pressed.9.png b/res/drawable-mdpi-finger/btn_dial_action_left_pressed.9.png
new file mode 100644 (file)
index 0000000..542abe7
Binary files /dev/null and b/res/drawable-mdpi-finger/btn_dial_action_left_pressed.9.png differ
diff --git a/res/drawable-mdpi-finger/btn_dial_action_left_selected.9.png b/res/drawable-mdpi-finger/btn_dial_action_left_selected.9.png
new file mode 100644 (file)
index 0000000..34caba1
Binary files /dev/null and b/res/drawable-mdpi-finger/btn_dial_action_left_selected.9.png differ
diff --git a/res/drawable-mdpi-finger/btn_dial_action_middle_disable.9.png b/res/drawable-mdpi-finger/btn_dial_action_middle_disable.9.png
new file mode 100644 (file)
index 0000000..0740c95
Binary files /dev/null and b/res/drawable-mdpi-finger/btn_dial_action_middle_disable.9.png differ
diff --git a/res/drawable-mdpi-finger/btn_dial_action_middle_disable_focused.9.png b/res/drawable-mdpi-finger/btn_dial_action_middle_disable_focused.9.png
new file mode 100644 (file)
index 0000000..c57627f
Binary files /dev/null and b/res/drawable-mdpi-finger/btn_dial_action_middle_disable_focused.9.png differ
diff --git a/res/drawable-mdpi-finger/btn_dial_action_middle_normal.9.png b/res/drawable-mdpi-finger/btn_dial_action_middle_normal.9.png
new file mode 100644 (file)
index 0000000..0740c95
Binary files /dev/null and b/res/drawable-mdpi-finger/btn_dial_action_middle_normal.9.png differ
diff --git a/res/drawable-mdpi-finger/btn_dial_action_middle_pressed.9.png b/res/drawable-mdpi-finger/btn_dial_action_middle_pressed.9.png
new file mode 100644 (file)
index 0000000..a5f9f98
Binary files /dev/null and b/res/drawable-mdpi-finger/btn_dial_action_middle_pressed.9.png differ
diff --git a/res/drawable-mdpi-finger/btn_dial_action_middle_selected.9.png b/res/drawable-mdpi-finger/btn_dial_action_middle_selected.9.png
new file mode 100644 (file)
index 0000000..dcd4b82
Binary files /dev/null and b/res/drawable-mdpi-finger/btn_dial_action_middle_selected.9.png differ
diff --git a/res/drawable-mdpi-finger/btn_dial_action_right_disable.9.png b/res/drawable-mdpi-finger/btn_dial_action_right_disable.9.png
new file mode 100644 (file)
index 0000000..85dfff0
Binary files /dev/null and b/res/drawable-mdpi-finger/btn_dial_action_right_disable.9.png differ
diff --git a/res/drawable-mdpi-finger/btn_dial_action_right_disable_focused.9.png b/res/drawable-mdpi-finger/btn_dial_action_right_disable_focused.9.png
new file mode 100644 (file)
index 0000000..1f76f0c
Binary files /dev/null and b/res/drawable-mdpi-finger/btn_dial_action_right_disable_focused.9.png differ
diff --git a/res/drawable-mdpi-finger/btn_dial_action_right_normal.9.png b/res/drawable-mdpi-finger/btn_dial_action_right_normal.9.png
new file mode 100644 (file)
index 0000000..85dfff0
Binary files /dev/null and b/res/drawable-mdpi-finger/btn_dial_action_right_normal.9.png differ
diff --git a/res/drawable-mdpi-finger/btn_dial_action_right_pressed.9.png b/res/drawable-mdpi-finger/btn_dial_action_right_pressed.9.png
new file mode 100644 (file)
index 0000000..226633f
Binary files /dev/null and b/res/drawable-mdpi-finger/btn_dial_action_right_pressed.9.png differ
diff --git a/res/drawable-mdpi-finger/btn_dial_action_right_selected.9.png b/res/drawable-mdpi-finger/btn_dial_action_right_selected.9.png
new file mode 100644 (file)
index 0000000..9cca52c
Binary files /dev/null and b/res/drawable-mdpi-finger/btn_dial_action_right_selected.9.png differ
diff --git a/res/drawable-mdpi-finger/btn_dial_normal.9.png b/res/drawable-mdpi-finger/btn_dial_normal.9.png
new file mode 100644 (file)
index 0000000..748dd8a
Binary files /dev/null and b/res/drawable-mdpi-finger/btn_dial_normal.9.png differ
diff --git a/res/drawable-mdpi-finger/btn_dial_normal_blue.9.png b/res/drawable-mdpi-finger/btn_dial_normal_blue.9.png
new file mode 100644 (file)
index 0000000..7c8c2ca
Binary files /dev/null and b/res/drawable-mdpi-finger/btn_dial_normal_blue.9.png differ
diff --git a/res/drawable-mdpi-finger/btn_dial_normal_green.9.png b/res/drawable-mdpi-finger/btn_dial_normal_green.9.png
new file mode 100644 (file)
index 0000000..b220650
Binary files /dev/null and b/res/drawable-mdpi-finger/btn_dial_normal_green.9.png differ
diff --git a/res/drawable-mdpi-finger/btn_dial_pressed.9.png b/res/drawable-mdpi-finger/btn_dial_pressed.9.png
new file mode 100644 (file)
index 0000000..83f9c62
Binary files /dev/null and b/res/drawable-mdpi-finger/btn_dial_pressed.9.png differ
diff --git a/res/drawable-mdpi-finger/btn_dial_selected.9.png b/res/drawable-mdpi-finger/btn_dial_selected.9.png
new file mode 100644 (file)
index 0000000..edc7bcb
Binary files /dev/null and b/res/drawable-mdpi-finger/btn_dial_selected.9.png differ
diff --git a/res/drawable-mdpi-finger/btn_dial_textfield_activated.9.png b/res/drawable-mdpi-finger/btn_dial_textfield_activated.9.png
new file mode 100644 (file)
index 0000000..de65d44
Binary files /dev/null and b/res/drawable-mdpi-finger/btn_dial_textfield_activated.9.png differ
diff --git a/res/drawable-mdpi-finger/btn_dial_textfield_normal.9.png b/res/drawable-mdpi-finger/btn_dial_textfield_normal.9.png
new file mode 100644 (file)
index 0000000..d3613e3
Binary files /dev/null and b/res/drawable-mdpi-finger/btn_dial_textfield_normal.9.png differ
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..fa7147efe7d027a9b3896d7e326713e7942f66e4
Binary files /dev/null and b/res/drawable-mdpi-finger/btn_dial_textfield_pressed.9.png differ
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..09db4226a02394799c9e59ba780f8b291cbe4c3f
Binary files /dev/null and b/res/drawable-mdpi-finger/btn_dial_textfield_selected.9.png differ
diff --git a/res/drawable-mdpi-finger/btn_dial_textfield_pressed.9.png b/res/drawable-mdpi-finger/btn_dial_textfield_pressed.9.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..d04add7f96242c1a6fd6e2359272e304118a4b8f
Binary files /dev/null and b/res/drawable-mdpi-finger/dial_num_0_blk.png differ
diff --git a/res/drawable-mdpi-finger/btn_dial_textfield_selected.9.png b/res/drawable-mdpi-finger/btn_dial_textfield_selected.9.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..c3b3f2ca4e8b9bc09dd0ea460de341b8ff8b2c2b
Binary files /dev/null and b/res/drawable-mdpi-finger/dial_num_0_wht.png differ
diff --git a/res/drawable-mdpi-finger/dial_num_0_blk.png b/res/drawable-mdpi-finger/dial_num_0_blk.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..75a8ed84dd238c6f2697839b9f78f613b0127082
Binary files /dev/null and b/res/drawable-mdpi-finger/dial_num_1_no_vm_blk.png differ
diff --git a/res/drawable-mdpi-finger/dial_num_0_wht.png b/res/drawable-mdpi-finger/dial_num_0_wht.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..a5bdb4131cb7f7d25d61bd5a903cd09a475392ce
Binary files /dev/null and b/res/drawable-mdpi-finger/dial_num_1_no_vm_wht.png differ
diff --git a/res/drawable-mdpi-finger/dial_num_1_no_vm_blk.png b/res/drawable-mdpi-finger/dial_num_1_no_vm_blk.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..1d8a35c320a533f6ea6497d5976d68dd889c5c00
Binary files /dev/null and b/res/drawable-mdpi-finger/dial_num_2_blk.png differ
diff --git a/res/drawable-mdpi-finger/dial_num_1_no_vm_wht.png b/res/drawable-mdpi-finger/dial_num_1_no_vm_wht.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..ac99cec1d2e77a39194ca8939023b1eb36853499
Binary files /dev/null and b/res/drawable-mdpi-finger/dial_num_2_wht.png differ
diff --git a/res/drawable-mdpi-finger/dial_num_2_blk.png b/res/drawable-mdpi-finger/dial_num_2_blk.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..cf78e044799cbc9164f202054cb1cd5ddf23a0b5
Binary files /dev/null and b/res/drawable-mdpi-finger/dial_num_3_blk.png differ
diff --git a/res/drawable-mdpi-finger/dial_num_2_wht.png b/res/drawable-mdpi-finger/dial_num_2_wht.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..69170b9f69801691ad7530dff4950fa92404d1fc
Binary files /dev/null and b/res/drawable-mdpi-finger/dial_num_3_wht.png differ
diff --git a/res/drawable-mdpi-finger/dial_num_3_blk.png b/res/drawable-mdpi-finger/dial_num_3_blk.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..c9c12c2614e2eb8967292b611dd3601f269ede19
Binary files /dev/null and b/res/drawable-mdpi-finger/dial_num_4_blk.png differ
diff --git a/res/drawable-mdpi-finger/dial_num_3_wht.png b/res/drawable-mdpi-finger/dial_num_3_wht.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..48a02a56e83881532e07b1f28ec9cf6b57f10cc2
Binary files /dev/null and b/res/drawable-mdpi-finger/dial_num_4_wht.png differ
diff --git a/res/drawable-mdpi-finger/dial_num_4_blk.png b/res/drawable-mdpi-finger/dial_num_4_blk.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..a89dd8f5c0d7ca0a377607c329e0203e2d8f84ef
Binary files /dev/null and b/res/drawable-mdpi-finger/dial_num_5_blk.png differ
diff --git a/res/drawable-mdpi-finger/dial_num_4_wht.png b/res/drawable-mdpi-finger/dial_num_4_wht.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..e3c994063a8cda0e95a58ae5c42d6850cc8fffb5
Binary files /dev/null and b/res/drawable-mdpi-finger/dial_num_5_wht.png differ
diff --git a/res/drawable-mdpi-finger/dial_num_5_blk.png b/res/drawable-mdpi-finger/dial_num_5_blk.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..c282afbf3a898f9053063e70f3f7525b3d8c215c
Binary files /dev/null and b/res/drawable-mdpi-finger/dial_num_6_blk.png differ
diff --git a/res/drawable-mdpi-finger/dial_num_5_wht.png b/res/drawable-mdpi-finger/dial_num_5_wht.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..ab12781be4be201f8623b161af5c1374ed0ef60e
Binary files /dev/null and b/res/drawable-mdpi-finger/dial_num_6_wht.png differ
diff --git a/res/drawable-mdpi-finger/dial_num_6_blk.png b/res/drawable-mdpi-finger/dial_num_6_blk.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..df273a2f0a09a4a27511b187332fd88a01e9b428
Binary files /dev/null and b/res/drawable-mdpi-finger/dial_num_7_blk.png differ
diff --git a/res/drawable-mdpi-finger/dial_num_6_wht.png b/res/drawable-mdpi-finger/dial_num_6_wht.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..9e6620592dd4bce6696ce339b8c80bae46fcb776
Binary files /dev/null and b/res/drawable-mdpi-finger/dial_num_7_wht.png differ
diff --git a/res/drawable-mdpi-finger/dial_num_7_blk.png b/res/drawable-mdpi-finger/dial_num_7_blk.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..9e5654fa4c68f2b53e149a92c94d120b4dbb49d7
Binary files /dev/null and b/res/drawable-mdpi-finger/dial_num_8_blk.png differ
diff --git a/res/drawable-mdpi-finger/dial_num_7_wht.png b/res/drawable-mdpi-finger/dial_num_7_wht.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..2af30fa3854f384dc8c6c1ab12a184d169b119d3
Binary files /dev/null and b/res/drawable-mdpi-finger/dial_num_8_wht.png differ
diff --git a/res/drawable-mdpi-finger/dial_num_8_blk.png b/res/drawable-mdpi-finger/dial_num_8_blk.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..6ae1943626ba42e98cf01956ee32975528ed0750
Binary files /dev/null and b/res/drawable-mdpi-finger/dial_num_9_blk.png differ
diff --git a/res/drawable-mdpi-finger/dial_num_8_wht.png b/res/drawable-mdpi-finger/dial_num_8_wht.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..1c99b615efebb24f40b3d986e96f59850a0530ff
Binary files /dev/null and b/res/drawable-mdpi-finger/dial_num_9_wht.png differ
diff --git a/res/drawable-mdpi-finger/dial_num_9_blk.png b/res/drawable-mdpi-finger/dial_num_9_blk.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..add133efff0deee04b1921aa6209df6c69e1808d
Binary files /dev/null and b/res/drawable-mdpi-finger/dial_num_pound_blk.png differ
diff --git a/res/drawable-mdpi-finger/dial_num_9_wht.png b/res/drawable-mdpi-finger/dial_num_9_wht.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..e17f2bf62f59a01f4e92b7f6fb2ccc8dfb818950
Binary files /dev/null and b/res/drawable-mdpi-finger/dial_num_pound_wht.png differ
diff --git a/res/drawable-mdpi-finger/dial_num_pound_blk.png b/res/drawable-mdpi-finger/dial_num_pound_blk.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..f649f14f19941d3818d84ea091020455be4a739c
Binary files /dev/null and b/res/drawable-mdpi-finger/dial_num_star_blk.png differ
diff --git a/res/drawable-mdpi-finger/dial_num_pound_wht.png b/res/drawable-mdpi-finger/dial_num_pound_wht.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..86113edf76a3bd506e5f501ed218f92d09db41e3
Binary files /dev/null and b/res/drawable-mdpi-finger/dial_num_star_wht.png differ
diff --git a/res/drawable-mdpi-finger/dial_num_star_blk.png b/res/drawable-mdpi-finger/dial_num_star_blk.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..1942899c2bfb8cc385a8801b7d947a0ff5e5a012
Binary files /dev/null and b/res/drawable-mdpi-finger/ic_dial_action_call.png differ
diff --git a/res/drawable-mdpi-finger/dial_num_star_wht.png b/res/drawable-mdpi-finger/dial_num_star_wht.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..440ae37de18f99cada7085f93ba175b078afec9d
Binary files /dev/null and b/res/drawable-mdpi-finger/ic_dial_action_delete.png differ
diff --git a/res/drawable-mdpi-finger/ic_dial_action_call.png b/res/drawable-mdpi-finger/ic_dial_action_call.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..cb07d1a7b4d7f145a6a5b13d6e6eb7e1f40d91b9
Binary files /dev/null and b/res/drawable-mdpi-finger/ic_dial_action_voice_mail.png differ
diff --git a/res/drawable-mdpi-finger/ic_dial_action_delete.png b/res/drawable-mdpi-finger/ic_dial_action_delete.png
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..bb0d4d4a1aeb4485933617bc5707a666b2e63ea4
Binary files /dev/null and b/res/drawable-mdpi/bg_in_call_gradient_bluetooth.9.png differ
diff --git a/res/drawable-mdpi-finger/ic_dial_action_voice_mail.png b/res/drawable-mdpi-finger/ic_dial_action_voice_mail.png
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..aa0155e7b3e0b9849d73168c9c899b48136a5a24
Binary files /dev/null and b/res/drawable-mdpi/bg_in_call_gradient_connected.9.png differ
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..35451d49243c60cb6ab1d27bc2483cbf692cd14f
Binary files /dev/null and b/res/drawable-mdpi/bg_in_call_gradient_ended.9.png differ
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..800689e805f985e21aa212a635ef8f74c38b94d7
Binary files /dev/null and b/res/drawable-mdpi/bg_in_call_gradient_on_hold.9.png differ
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..adb3abdf847d639dc51047416075a9174e03ce0b
Binary files /dev/null and b/res/drawable-mdpi/bg_in_call_gradient_unidentified.9.png differ
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..89b9dd68b9b33d761ecefaa287e0c0178b9bb7ea
Binary files /dev/null and b/res/drawable-mdpi/btn_in_call_answer_dotted_green.9.png differ
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..18f24dbc1afae183cdea57888b93ec98794d4d92
Binary files /dev/null and b/res/drawable-mdpi/btn_in_call_answer_dotted_red.9.png differ
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..5ff50ec4d29da05c3f255d493f418751919b959e
Binary files /dev/null and b/res/drawable-mdpi/btn_in_call_answer_normal.9.png differ
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..d7e285ae6859626be0ffd39c39c6241068b326e5
Binary files /dev/null and b/res/drawable-mdpi/btn_in_call_answer_pressed.9.png differ
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..6ade8929379c21e4ee1cb046cab8cc587b284143
Binary files /dev/null and b/res/drawable-mdpi/btn_in_call_main_disable.9.png differ
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..178f08a9025a8959599e1ead47c15beae26ec050
Binary files /dev/null and b/res/drawable-mdpi/btn_in_call_main_disable_focused.9.png differ
old mode 100644 (file)
new mode 100755 (executable)
similarity index 72%
rename from res/drawable-finger/ic_tab_unselected_recent.png
rename to res/drawable-mdpi-finger/ic_tab_unselected_recent.png
index 247a1180fa04be5dd119744285bd946f94984d4f..f0c18266d07f27b0a7afb785e1268ecd98b0c5dc
Binary files a/res/drawable-finger/dial_num_0_blk.png and b/res/drawable-mdpi/btn_in_call_main_normal.9.png differ
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..8a22809336b69db1c19e10f908404153f5a3f27b
Binary files /dev/null and b/res/drawable-mdpi/btn_in_call_main_pressed.9.png differ
diff --git a/res/drawable-mdpi/bg_in_call_gradient_bluetooth.9.png b/res/drawable-mdpi/bg_in_call_gradient_bluetooth.9.png
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..749965ff6576da488c1abb2ab44c4b4410876154
Binary files /dev/null and b/res/drawable-mdpi/btn_in_call_main_selected.9.png differ
diff --git a/res/drawable-mdpi/bg_in_call_gradient_connected.9.png b/res/drawable-mdpi/bg_in_call_gradient_connected.9.png
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..3eab57b402b2db467d9f45373f577d89d470feb1
Binary files /dev/null and b/res/drawable-mdpi/btn_in_call_manage_conf_normal.9.png differ
diff --git a/res/drawable-mdpi/bg_in_call_gradient_ended.9.png b/res/drawable-mdpi/bg_in_call_gradient_ended.9.png
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..1cfea1cb4281b516a78cb61c1fb0b79859e62dc7
Binary files /dev/null and b/res/drawable-mdpi/btn_in_call_manage_conf_pressed.9.png differ
diff --git a/res/drawable-mdpi/bg_in_call_gradient_on_hold.9.png b/res/drawable-mdpi/bg_in_call_gradient_on_hold.9.png
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..de71406b3f350e066f28825b4260a4dc1f8598c5
Binary files /dev/null and b/res/drawable-mdpi/btn_in_call_manage_conf_selected.9.png differ
diff --git a/res/drawable-mdpi/bg_in_call_gradient_unidentified.9.png b/res/drawable-mdpi/bg_in_call_gradient_unidentified.9.png
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..359837545d7c31910cce122cfe7c4dc7cc3432cd
Binary files /dev/null and b/res/drawable-mdpi/btn_in_call_round_disable.png differ
diff --git a/res/drawable-mdpi/btn_in_call_answer_dotted_green.9.png b/res/drawable-mdpi/btn_in_call_answer_dotted_green.9.png
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..8680a231b9fd6609a013a9deabe44fddbabc374c
Binary files /dev/null and b/res/drawable-mdpi/btn_in_call_round_disable_focused.png differ
diff --git a/res/drawable-mdpi/btn_in_call_answer_dotted_red.9.png b/res/drawable-mdpi/btn_in_call_answer_dotted_red.9.png
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..d7524f647192d8e453bd36959dfe16cb5ab704d7
Binary files /dev/null and b/res/drawable-mdpi/btn_in_call_round_normal.png differ
diff --git a/res/drawable-mdpi/btn_in_call_answer_normal.9.png b/res/drawable-mdpi/btn_in_call_answer_normal.9.png
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..c3dd47db8aaa7544b3d538789296ed5d716ffb4f
Binary files /dev/null and b/res/drawable-mdpi/btn_in_call_round_pressed.png differ
diff --git a/res/drawable-mdpi/btn_in_call_answer_pressed.9.png b/res/drawable-mdpi/btn_in_call_answer_pressed.9.png
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..79b5516626526b36e34f4755b5ea6d3127824408
Binary files /dev/null and b/res/drawable-mdpi/btn_in_call_round_selected.png differ
diff --git a/res/drawable-mdpi/btn_in_call_main_disable.9.png b/res/drawable-mdpi/btn_in_call_main_disable.9.png
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..37b1e13389b925a0ec7b1e3bcedf0652306e0607
Binary files /dev/null and b/res/drawable-mdpi/btn_in_call_switch_off_disable.9.png differ
diff --git a/res/drawable-mdpi/btn_in_call_main_disable_focused.9.png b/res/drawable-mdpi/btn_in_call_main_disable_focused.9.png
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..14e78788d95f286fb60db6a7946ebefc191fbade
Binary files /dev/null and b/res/drawable-mdpi/btn_in_call_switch_off_disable_focused.9.png differ
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..b463f4405bfb2d7662505fd7a6599999dd733bdb
Binary files /dev/null and b/res/drawable-mdpi/btn_in_call_switch_off_normal.9.png differ
diff --git a/res/drawable-mdpi/btn_in_call_main_pressed.9.png b/res/drawable-mdpi/btn_in_call_main_pressed.9.png
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..022238131a08a7b10b53c1752942dc470f46da0f
Binary files /dev/null and b/res/drawable-mdpi/btn_in_call_switch_off_pressed.9.png differ
diff --git a/res/drawable-mdpi/btn_in_call_main_selected.9.png b/res/drawable-mdpi/btn_in_call_main_selected.9.png
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..5a02f20fc108bf91f5316f0443bf3c2427bc021a
Binary files /dev/null and b/res/drawable-mdpi/btn_in_call_switch_off_selected.9.png differ
diff --git a/res/drawable-mdpi/btn_in_call_manage_conf_normal.9.png b/res/drawable-mdpi/btn_in_call_manage_conf_normal.9.png
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..479998774618ec0e09b5db659716b998dc108c94
Binary files /dev/null and b/res/drawable-mdpi/btn_in_call_switch_on_disable.9.png differ
diff --git a/res/drawable-mdpi/btn_in_call_manage_conf_pressed.9.png b/res/drawable-mdpi/btn_in_call_manage_conf_pressed.9.png
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..ee75b53e5ab4175b5e84555fcf82c70603ceb032
Binary files /dev/null and b/res/drawable-mdpi/btn_in_call_switch_on_disable_focused.9.png differ
diff --git a/res/drawable-mdpi/btn_in_call_manage_conf_selected.9.png b/res/drawable-mdpi/btn_in_call_manage_conf_selected.9.png
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..0b52de47284684ad08e0096fde10327b20ec35fb
Binary files /dev/null and b/res/drawable-mdpi/btn_in_call_switch_on_normal.9.png differ
diff --git a/res/drawable-mdpi/btn_in_call_round_disable.png b/res/drawable-mdpi/btn_in_call_round_disable.png
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..5a8ca65f23200ec8deaf488fd58a6776e0a1b5a5
Binary files /dev/null and b/res/drawable-mdpi/btn_in_call_switch_on_pressed.9.png differ
diff --git a/res/drawable-mdpi/btn_in_call_round_disable_focused.png b/res/drawable-mdpi/btn_in_call_round_disable_focused.png
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..f8e701687dfe7d3c2606c9c682de5c5788c7146a
Binary files /dev/null and b/res/drawable-mdpi/btn_in_call_switch_on_selected.9.png differ
diff --git a/res/drawable-mdpi/btn_in_call_round_normal.png b/res/drawable-mdpi/btn_in_call_round_normal.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..809560474f09da5858a40c5cb6f301eb3df669a9
Binary files /dev/null and b/res/drawable-mdpi/dialog_bg_calling_via.9.png differ
diff --git a/res/drawable-mdpi/btn_in_call_round_pressed.png b/res/drawable-mdpi/btn_in_call_round_pressed.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..385b7c6113e38910f01af0c00c6750d23e6973bf
Binary files /dev/null and b/res/drawable-mdpi/green_selected.9.png differ
diff --git a/res/drawable-mdpi/btn_in_call_round_selected.png b/res/drawable-mdpi/btn_in_call_round_selected.png
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..c6cf436cdf3151e2c3bf70362c6ea3be832c563f
Binary files /dev/null and b/res/drawable-mdpi/ic_btn_next.png differ
diff --git a/res/drawable-mdpi/btn_in_call_switch_off_disable.9.png b/res/drawable-mdpi/btn_in_call_switch_off_disable.9.png
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..52f5a51b727f6755cd0f4fab1b06a0edb32492b0
Binary files /dev/null and b/res/drawable-mdpi/ic_in_call_touch_add_call.png differ
diff --git a/res/drawable-mdpi/btn_in_call_switch_off_disable_focused.9.png b/res/drawable-mdpi/btn_in_call_switch_off_disable_focused.9.png
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..11a8fc32ef7b7beb05060f89f8b5f9c29bd17956
Binary files /dev/null and b/res/drawable-mdpi/ic_in_call_touch_answer.png differ
diff --git a/res/drawable-mdpi/btn_in_call_switch_off_normal.9.png b/res/drawable-mdpi/btn_in_call_switch_off_normal.9.png
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..5d465c5b4d43380e181f54e5bf13a30820c755ed
Binary files /dev/null and b/res/drawable-mdpi/ic_in_call_touch_dialpad.png differ
diff --git a/res/drawable-mdpi/btn_in_call_switch_off_pressed.9.png b/res/drawable-mdpi/btn_in_call_switch_off_pressed.9.png
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..9810fff0b327c3c4958beed5632c1bce6a404cac
Binary files /dev/null and b/res/drawable-mdpi/ic_in_call_touch_dialpad_close.png differ
diff --git a/res/drawable-mdpi/btn_in_call_switch_off_selected.9.png b/res/drawable-mdpi/btn_in_call_switch_off_selected.9.png
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..8592993740fbb2a978ad5f2e1631c96d65059e80
Binary files /dev/null and b/res/drawable-mdpi/ic_in_call_touch_end.png differ
diff --git a/res/drawable-mdpi/btn_in_call_switch_on_disable.9.png b/res/drawable-mdpi/btn_in_call_switch_on_disable.9.png
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..714f4fd6a03de91139dbe6898473b31e3aed8341
Binary files /dev/null and b/res/drawable-mdpi/ic_in_call_touch_hold.png differ
diff --git a/res/drawable-mdpi/btn_in_call_switch_on_disable_focused.9.png b/res/drawable-mdpi/btn_in_call_switch_on_disable_focused.9.png
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..b7f0e429fa99c3164d5073a0c7c7081b28101d9a
Binary files /dev/null and b/res/drawable-mdpi/ic_in_call_touch_merge_call.png differ
diff --git a/res/drawable-mdpi/btn_in_call_switch_on_normal.9.png b/res/drawable-mdpi/btn_in_call_switch_on_normal.9.png
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..b21c916448cba4849d7bd1ac857885d717ff293e
Binary files /dev/null and b/res/drawable-mdpi/ic_in_call_touch_round_add_call.png differ
diff --git a/res/drawable-mdpi/btn_in_call_switch_on_pressed.9.png b/res/drawable-mdpi/btn_in_call_switch_on_pressed.9.png
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..31dfcc4264c2d0b3ef953df771abab5ee7e88e44
Binary files /dev/null and b/res/drawable-mdpi/ic_in_call_touch_round_hold.png differ
diff --git a/res/drawable-mdpi/btn_in_call_switch_on_selected.9.png b/res/drawable-mdpi/btn_in_call_switch_on_selected.9.png
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..640e00f11dead31803311132a5b065cd42799220
Binary files /dev/null and b/res/drawable-mdpi/ic_in_call_touch_round_manage_conference.png differ
diff --git a/res/drawable-mdpi/dialog_bg_calling_via.9.png b/res/drawable-mdpi/dialog_bg_calling_via.9.png
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..76abefbfc7c03ee4cf5a344f9181354b14c8f0bf
Binary files /dev/null and b/res/drawable-mdpi/ic_in_call_touch_round_merge_call.png differ
diff --git a/res/drawable-mdpi/green_selected.9.png b/res/drawable-mdpi/green_selected.9.png
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..a42caaa087c63bb96d725a29a00e991fe74ab631
Binary files /dev/null and b/res/drawable-mdpi/ic_in_call_touch_round_swap.png differ
diff --git a/res/drawable-mdpi/ic_btn_next.png b/res/drawable-mdpi/ic_btn_next.png
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..59e897d8bb41a2770e34e7a4dae7257cf627284d
Binary files /dev/null and b/res/drawable-mdpi/ic_in_call_touch_round_unhold.png differ
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..cc23a10d943519597379d9e847cc74b2b1e1020f
Binary files /dev/null and b/res/drawable-mdpi/ic_in_call_touch_round_unhold_alt.png differ
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..ad43d9faef1c8db936b482b2d3a474bf2a1148a8
Binary files /dev/null and b/res/drawable-mdpi/ic_in_call_touch_swap.png differ
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..90b8cca13b54a311dcfd7fdb753ede1a529d9f6d
Binary files /dev/null and b/res/drawable-mdpi/ic_in_call_touch_unhold.png differ
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..e2bc483de27aeead441374fd35364d93101ae406
Binary files /dev/null and b/res/drawable-mdpi/ic_jog_dial_answer.png differ
diff --git a/res/drawable-mdpi/ic_in_call_touch_add_call.png b/res/drawable-mdpi/ic_in_call_touch_add_call.png
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..aa0fab224b558041ec33c1aa09a23d2309307d89
Binary files /dev/null and b/res/drawable-mdpi/ic_jog_dial_answer_and_end.png differ
diff --git a/res/drawable-mdpi/ic_in_call_touch_answer.png b/res/drawable-mdpi/ic_in_call_touch_answer.png
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..9effe375c3175fc0558f857c30edb7079bb548a9
Binary files /dev/null and b/res/drawable-mdpi/ic_jog_dial_answer_and_hold.png differ
diff --git a/res/drawable-mdpi/ic_in_call_touch_dialpad.png b/res/drawable-mdpi/ic_in_call_touch_dialpad.png
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..81c76b59a453e3a4d79c416d17121329fbc42662
Binary files /dev/null and b/res/drawable-mdpi/ic_jog_dial_decline.png differ
diff --git a/res/drawable-mdpi/ic_in_call_touch_dialpad_close.png b/res/drawable-mdpi/ic_in_call_touch_dialpad_close.png
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..b950f54be5715dbadde2aba1e1f6ced1b95d6266
Binary files /dev/null and b/res/drawable-mdpi/ic_jog_dial_silence_ringer.png differ
diff --git a/res/drawable-mdpi/ic_in_call_touch_end.png b/res/drawable-mdpi/ic_in_call_touch_end.png
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..b9aec697961c945ae236fa15fca6aa01e3d5ec1e
Binary files /dev/null and b/res/drawable-mdpi/ic_jog_dial_sound_off.png differ
diff --git a/res/drawable-mdpi/ic_in_call_touch_hold.png b/res/drawable-mdpi/ic_in_call_touch_hold.png
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..4952746ae419fdbb0ee49a7c2c08ffe8467f6d9e
Binary files /dev/null and b/res/drawable-mdpi/ic_jog_dial_sound_on.png differ
diff --git a/res/drawable-mdpi/ic_in_call_touch_merge_call.png b/res/drawable-mdpi/ic_in_call_touch_merge_call.png
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..e697d91d2224c750a71968847c3bb410c97010ba
Binary files /dev/null and b/res/drawable-mdpi/ic_jog_dial_unlock.png differ
diff --git a/res/drawable-mdpi/ic_in_call_touch_round_add_call.png b/res/drawable-mdpi/ic_in_call_touch_round_add_call.png
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..b592ba642810afd110fb9b2332ef901918c67b81
Binary files /dev/null and b/res/drawable-mdpi/ic_jog_dial_voice_search.png differ
diff --git a/res/drawable-mdpi/ic_in_call_touch_round_hold.png b/res/drawable-mdpi/ic_in_call_touch_round_hold.png
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..e68eb980302835eef4711602dae17bce8a72ce63
Binary files /dev/null and b/res/drawable-mdpi/incall_photo_border_lg.9.png differ
diff --git a/res/drawable-mdpi/ic_in_call_touch_round_manage_conference.png b/res/drawable-mdpi/ic_in_call_touch_round_manage_conference.png
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..40f9550de0217607b2144cb66350b35ddaa579a8
Binary files /dev/null and b/res/drawable-mdpi/incall_photo_border_med.9.png differ
diff --git a/res/drawable-mdpi/ic_in_call_touch_round_merge_call.png b/res/drawable-mdpi/ic_in_call_touch_round_merge_call.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..3d0a980f06b0f0bd11e1bb07bcb547504b38f9d6
Binary files /dev/null and b/res/drawable-mdpi/red_selected.9.png differ
diff --git a/res/drawable-mdpi/ic_in_call_touch_round_swap.png b/res/drawable-mdpi/ic_in_call_touch_round_swap.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..8b3dbd0c1cde784570824ff0c37804c365e2b139
Binary files /dev/null and b/res/drawable/green_divider.png differ
diff --git a/res/drawable-mdpi/ic_in_call_touch_round_unhold.png b/res/drawable-mdpi/ic_in_call_touch_round_unhold.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..711579b66fbd6f685870a8907e066ba041829b21
--- /dev/null
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- StateListDrawable used for buttons in the in-call onscreen touch UI. -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_window_focused="false" android:state_enabled="true"
+        android:drawable="@drawable/btn_in_call_main_normal" />
+
+    <item android:state_window_focused="false" android:state_enabled="false"
+        android:drawable="@drawable/btn_in_call_main_disable" />
+
+    <item android:state_pressed="true" 
+        android:drawable="@drawable/btn_in_call_main_pressed" />
+
+    <item android:state_focused="true" android:state_enabled="true"
+        android:drawable="@drawable/btn_in_call_main_selected" />
+
+    <item android:state_enabled="true"
+        android:drawable="@drawable/btn_in_call_main_normal" />
+
+    <item android:state_focused="true"
+        android:drawable="@drawable/btn_in_call_main_disable_focused" />
+
+    <item
+        android:drawable="@drawable/btn_in_call_main_disable" />
+
+</selector>
diff --git a/res/drawable-mdpi/ic_in_call_touch_round_unhold_alt.png b/res/drawable-mdpi/ic_in_call_touch_round_unhold_alt.png
deleted file mode 100644 (file)
index 80e59bd98921a32363499442ee202b7536bd477c..0000000000000000000000000000000000000000
Binary files a/res/drawable/incall_frame_bluetooth_short.9.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_in_call_touch_swap.png b/res/drawable-mdpi/ic_in_call_touch_swap.png
deleted file mode 100644 (file)
index 8bfd2ecd1fa537179d21f4deeabc99eb290fc332..0000000000000000000000000000000000000000
Binary files a/res/drawable/incall_frame_bluetooth_tall_land.9.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_in_call_touch_unhold.png b/res/drawable-mdpi/ic_in_call_touch_unhold.png
deleted file mode 100644 (file)
index 70c0ee4548f72e46dfb6dfc5f81d2953040e3fd2..0000000000000000000000000000000000000000
Binary files a/res/drawable/incall_frame_bluetooth_tall_port.9.png and /dev/null differ
deleted file mode 100644 (file)
index 1ccb659233cc51e2cc27d6604dd6b177f1129623..0000000000000000000000000000000000000000
Binary files a/res/drawable/incall_frame_connected_short.9.png and /dev/null differ
deleted file mode 100644 (file)
index af4aba924e1a522b3be3d5febd3e429212868c60..0000000000000000000000000000000000000000
Binary files a/res/drawable/incall_frame_connected_tall_land.9.png and /dev/null differ
deleted file mode 100644 (file)
index c72529f151539d331418059429655db180bc731c..0000000000000000000000000000000000000000
Binary files a/res/drawable/incall_frame_connected_tall_port.9.png and /dev/null differ
deleted file mode 100644 (file)
index f9f8e9795f64625595eec065296c6500bae9f590..0000000000000000000000000000000000000000
Binary files a/res/drawable/incall_frame_ended_tall_land.9.png and /dev/null differ
deleted file mode 100644 (file)
index cfbce46512e3e2237bd33717394bc36dc5ce6e8e..0000000000000000000000000000000000000000
Binary files a/res/drawable/incall_frame_ended_tall_port.9.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_jog_dial_answer.png b/res/drawable-mdpi/ic_jog_dial_answer.png
deleted file mode 100644 (file)
index 924ec91d4f57f3d9674763147a4d5075161106dc..0000000000000000000000000000000000000000
Binary files a/res/drawable/incall_frame_hold_short.9.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_jog_dial_answer_and_end.png b/res/drawable-mdpi/ic_jog_dial_answer_and_end.png
deleted file mode 100644 (file)
index fdfa4501fd3a1b9eabf299591bae0bb57fa5ddfa..0000000000000000000000000000000000000000
Binary files a/res/drawable/incall_frame_hold_tall_land.9.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_jog_dial_answer_and_hold.png b/res/drawable-mdpi/ic_jog_dial_answer_and_hold.png
deleted file mode 100644 (file)
index aa886a3570a9bdd8e5b5adc5e2491b0531033ce0..0000000000000000000000000000000000000000
Binary files a/res/drawable/incall_frame_hold_tall_port.9.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_jog_dial_decline.png b/res/drawable-mdpi/ic_jog_dial_decline.png
deleted file mode 100644 (file)
index 2eaa876f4ce251f5c3290fd7e010759c2a785e40..0000000000000000000000000000000000000000
Binary files a/res/drawable/incall_frame_normal_tall_land.9.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_jog_dial_silence_ringer.png b/res/drawable-mdpi/ic_jog_dial_silence_ringer.png
deleted file mode 100644 (file)
index 33467a313698a7c3502403b96f457f0478af41b0..0000000000000000000000000000000000000000
Binary files a/res/drawable/incall_frame_normal_tall_port.9.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_jog_dial_sound_off.png b/res/drawable-mdpi/ic_jog_dial_sound_off.png
deleted file mode 100644 (file)
index 6de37b7287252608932b1582293b69b44ed21a71..0000000000000000000000000000000000000000
Binary files a/res/drawable/incall_photo_border.9.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_jog_dial_sound_on.png b/res/drawable-mdpi/ic_jog_dial_sound_on.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..5750c07446d93f35199b7a9d71c4e415ae4a81cf
--- /dev/null
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- StateListDrawable used for the small round ImageButtons at the upper
+     corners of the in-call onscreen touch UI. -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_window_focused="false" android:state_enabled="true"
+        android:drawable="@drawable/btn_in_call_round_normal" />
+
+    <item android:state_window_focused="false" android:state_enabled="false"
+        android:drawable="@drawable/btn_in_call_round_disable" />
+
+    <item android:state_pressed="true" 
+        android:drawable="@drawable/btn_in_call_round_pressed" />
+
+    <item android:state_focused="true" android:state_enabled="true"
+        android:drawable="@drawable/btn_in_call_round_selected" />
+
+    <item android:state_enabled="true"
+        android:drawable="@drawable/btn_in_call_round_normal" />
+
+    <item android:state_focused="true"
+        android:drawable="@drawable/btn_in_call_round_disable_focused" />
+
+    <item
+        android:drawable="@drawable/btn_in_call_round_disable" />
+
+</selector>
diff --git a/res/drawable-mdpi/ic_jog_dial_unlock.png b/res/drawable-mdpi/ic_jog_dial_unlock.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..784a38d2d3cf2354ef65ca9ebb5545f4f2150067
--- /dev/null
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- StateListDrawable used for toggle buttons in the in-call onscreen touch UI. -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <!-- TODO: For now, we spell out every possible combination of
+         checked/focused/enabled/pressed here, since the assets were
+         created that way.
+         But instead, consider using a <layer-list> here so that the
+         background and the "toggle" indicator can be separate drawables.
+         That way, only the background drawable needs to care about the
+         focused/enabled/pressed state, and only the toggle indicator
+         needs to care about the "checked" state.  This would reduce the
+         number of separate image assets we need by almost half.  (See
+         btn_toggle_bg.xml in the framework for an example of this
+         design.) -->
+
+    <!-- "checked" states -->
+
+    <item android:state_window_focused="false" android:state_enabled="true"
+        android:state_checked="true"
+        android:drawable="@drawable/btn_in_call_switch_on_normal" />
+
+    <item android:state_window_focused="false" android:state_enabled="false"
+        android:state_checked="true"
+        android:drawable="@drawable/btn_in_call_switch_on_disable" />
+
+    <item android:state_pressed="true" 
+        android:state_checked="true"
+        android:drawable="@drawable/btn_in_call_switch_on_pressed" />
+
+    <item android:state_focused="true" android:state_enabled="true"
+        android:state_checked="true"
+        android:drawable="@drawable/btn_in_call_switch_on_selected" />
+
+    <item android:state_enabled="true"
+        android:state_checked="true"
+        android:drawable="@drawable/btn_in_call_switch_on_normal" />
+
+    <item android:state_focused="true"
+        android:state_checked="true"
+        android:drawable="@drawable/btn_in_call_switch_on_disable_focused" />
+
+    <item
+        android:state_checked="true"
+        android:drawable="@drawable/btn_in_call_switch_on_disable" />
+
+    <!-- "unchecked" states -->
+
+    <item android:state_window_focused="false" android:state_enabled="true"
+        android:state_checked="false"
+        android:drawable="@drawable/btn_in_call_switch_off_normal" />
+
+    <item android:state_window_focused="false" android:state_enabled="false"
+        android:state_checked="false"
+        android:drawable="@drawable/btn_in_call_switch_off_disable" />
+
+    <item android:state_pressed="true" 
+        android:state_checked="false"
+        android:drawable="@drawable/btn_in_call_switch_off_pressed" />
+
+    <item android:state_focused="true" android:state_enabled="true"
+        android:state_checked="false"
+        android:drawable="@drawable/btn_in_call_switch_off_selected" />
+
+    <item android:state_enabled="true"
+        android:state_checked="false"
+        android:drawable="@drawable/btn_in_call_switch_off_normal" />
+
+    <item android:state_focused="true"
+        android:state_checked="false"
+        android:drawable="@drawable/btn_in_call_switch_off_disable_focused" />
+
+    <item
+        android:drawable="@drawable/btn_in_call_switch_off_disable" />
+
+</selector>
diff --git a/res/drawable-mdpi/ic_jog_dial_voice_search.png b/res/drawable-mdpi/ic_jog_dial_voice_search.png
similarity index 62%
rename from
rename to res/drawable-mdpi/ic_jog_dial_voice_search.png
index e3b7c77ce9cc869cd40b63a2ed107849f6d73c7b..c221565d6fa95679c7d2ffddd937b00032db7479 100644 (file)
--- a/res/drawable-mdpi/ic_jog_dial_voice_search.png
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
+<!-- Copyright (C) 2009 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,12 +14,13 @@
      limitations under the License.
 -->
 
+<!-- StateListDrawable for the big "Manage conference" button that we show
+     in place of the usual contact photo during a conference call. -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" 
-        android:drawable="@drawable/btn_dialer_pressed" />
+    <item android:state_pressed="true"
+        android:drawable="@drawable/btn_in_call_manage_conf_pressed" />
     <item android:state_focused="true"
-        android:drawable="@drawable/btn_dialer_selected" />
+        android:drawable="@drawable/btn_in_call_manage_conf_selected" />
     <item
-         android:drawable="@drawable/btn_dialer_default" />
+        android:drawable="@drawable/btn_in_call_manage_conf_normal" />
 </selector>
-
deleted file mode 100644 (file)
index 3690b07b331c2a6e4c8776e0390b7e35e517c470..0000000000000000000000000000000000000000
Binary files a/res/drawable/picture_emergency.png and /dev/null differ
similarity index 73%
rename from res/drawable/ic_menu_answer_call.png
rename to res/drawable-mdpi/ic_menu_answer_call.png
index c72e47769cbec038d75a3d690f5f539d5429e08f..ebf1c9350ee54b5f5e018a6e0d3279eb13b6d498 100644 (file)
Binary files a/res/drawable-finger/dial_num_1_blk.png and b/res/drawable/picture_emergency25x25.png differ
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..b3d7555a9a27c386e8dd7ddbd40d9240a9f07dd3
Binary files /dev/null and b/res/drawable/picture_emergency32x32.png differ
index aa8f2b52df074ac0bbd6b198d77064b57a40ce26..98f84182bbf7aeba90e1a40ac3730c48fbe1da53 100644 (file)
@@ -4,9 +4,9 @@
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
-  
+
           http://www.apache.org/licenses/LICENSE-2.0
-  
+
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 
 <com.android.phone.ButtonGridLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/dialpad"
-    android:paddingLeft="10px"
-    android:paddingRight="10px"
-    android:layout_width="fill_parent"
+    android:paddingLeft="7dp"
+    android:paddingRight="7dp"
+    android:paddingTop="6dp"
+    android:paddingBottom="6dp"
+    android:layout_width="wrap_content"
     android:layout_height="wrap_content"
+    android:layout_gravity="center_horizontal"
+    android:layout_weight="1"
 >
         <ImageButton android:id="@+id/one"
-            android:layout_width="96px"
-            android:layout_height="76px"
+            android:layout_width="88dp"
+            android:layout_height="50dp"
             android:src="@drawable/dial_num_1_no_vm"
             android:background="@drawable/btn_dial"
         />
-            
+
         <ImageButton android:id="@+id/two"
-            android:layout_width="96px"
-            android:layout_height="76px"
+            android:layout_width="88dp"
+            android:layout_height="50dp"
             android:src="@drawable/dial_num_2"
             android:background="@drawable/btn_dial"
         />
 
         <ImageButton android:id="@+id/three"
-            android:layout_width="96px"
-            android:layout_height="76px"
+            android:layout_width="88dp"
+            android:layout_height="50dp"
             android:src="@drawable/dial_num_3"
             android:background="@drawable/btn_dial"
         />
 
         <ImageButton android:id="@+id/four"
-            android:layout_width="96px"
-            android:layout_height="76px"
+            android:layout_width="88dp"
+            android:layout_height="50dp"
             android:src="@drawable/dial_num_4"
             android:background="@drawable/btn_dial"
         />
-        
+
         <ImageButton android:id="@+id/five"
-            android:layout_width="96px"
-            android:layout_height="76px"
+            android:layout_width="88dp"
+            android:layout_height="50dp"
             android:src="@drawable/dial_num_5"
             android:background="@drawable/btn_dial"
         />
 
         <ImageButton android:id="@+id/six"
-            android:layout_width="96px"
-            android:layout_height="76px"
+            android:layout_width="88dp"
+            android:layout_height="50dp"
             android:src="@drawable/dial_num_6"
             android:background="@drawable/btn_dial"
         />
 
         <ImageButton android:id="@+id/seven"
-            android:layout_width="96px"
-            android:layout_height="76px"
+            android:layout_width="88dp"
+            android:layout_height="50dp"
             android:src="@drawable/dial_num_7"
             android:background="@drawable/btn_dial"
         />
-    
+
         <ImageButton android:id="@+id/eight"
-            android:layout_width="96px"
-            android:layout_height="76px"
+            android:layout_width="88dp"
+            android:layout_height="50dp"
             android:src="@drawable/dial_num_8"
             android:background="@drawable/btn_dial"
         />
 
         <ImageButton android:id="@+id/nine"
-            android:layout_width="96px"
-            android:layout_height="76px"
+            android:layout_width="88dp"
+            android:layout_height="50dp"
             android:src="@drawable/dial_num_9"
             android:background="@drawable/btn_dial"
         />
 
         <ImageButton android:id="@+id/star"
-            android:layout_width="96px"
-            android:layout_height="76px"
+            android:layout_width="88dp"
+            android:layout_height="50dp"
             android:src="@drawable/dial_num_star"
             android:background="@drawable/btn_dial"
         />
-    
+
         <ImageButton android:id="@+id/zero"
-            android:layout_width="96px"
-            android:layout_height="76px"
+            android:layout_width="88dp"
+            android:layout_height="50dp"
             android:src="@drawable/dial_num_0"
             android:background="@drawable/btn_dial"
         />
 
         <ImageButton android:id="@+id/pound"
-            android:layout_width="96px"
-            android:layout_height="76px"
+            android:layout_width="88dp"
+            android:layout_height="50dp"
             android:src="@drawable/dial_num_pound"
             android:background="@drawable/btn_dial"
         />
deleted file mode 100644 (file)
index 92f817336db2aab218dece31b9b1de17f832cc77..0000000000000000000000000000000000000000
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- The portrait-oriented dtmf dialer display does not exist.  The <merge/>
-     tag is just a dummy.  Instead, portrait mode uses dtmf_twelve_key_dialer
-     for user interaction in sending DTMF tones. -->
-<merge/>
index 5b5fdbc56a681aea7430501efd26fe7131bbb6ea..354976dad22fe8435abe2adc8652b7f68e87963f 100644 (file)
@@ -4,9 +4,9 @@
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
-  
+
           http://www.apache.org/licenses/LICENSE-2.0
-  
+
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      limitations under the License.
 -->
 
-<!-- Sliding drawer widget containing the DTMF dialer in portrait mode.  In
-     landscape mode, the item is replaced with a simple <merge/>, so its
-     never inflated. -->
+<!-- Sliding drawer widget containing the in-call DTMF dialpad.
+
+     On devices that do *not* use an onscreen InCallTouchUi
+     widget, the dialpad is contained within a SlidingDrawer
+     (which provides a "handle" that the user must drag open
+     to access the dialpad.)
+
+     See non_drawer_dialpad.xml for the corresponding layout file
+     for devices that *do* use an InCallTouchUi widget.
+     -->
 <SlidingDrawer
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/dialer_container"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:topOffset="5px"
-    android:bottomOffset="7px"
+    android:topOffset="5dp"
+    android:bottomOffset="7dp"
     android:handle="@+id/dialer_tab"
     android:content="@+id/dtmf_dialer"
     android:allowSingleTap="false"
+    android:visibility="gone"
     >
 
     <!-- Drawer handle -->
         <!-- Number Display Field, padded for correct text alignment -->
         <EditText android:id="@+id/dtmfDialerField"
             android:layout_width="fill_parent"
-            android:layout_height="66px"
-            android:layout_marginTop="14px"
-            android:layout_marginBottom="5px"
-            android:layout_marginLeft="3px"
-            android:layout_marginRight="3px"
-            android:paddingRight="16px"
-            android:paddingLeft="16px"
+            android:layout_height="66dp"
+            android:layout_marginTop="14dp"
+            android:layout_marginBottom="6dp"
+            android:layout_marginLeft="3dp"
+            android:layout_marginRight="3dp"
+            android:paddingRight="16dp"
+            android:paddingLeft="16dp"
             android:maxLines="1"
             android:scrollHorizontally="true"
             android:textSize="28sp"
         <!-- Keypad section -->
         <include layout="@layout/dialpad" />
 
+        <!-- Dummy element to pad below the dialpad -->
+        <View android:layout_height="1dp"
+            android:layout_width="fill_parent"
+            android:layout_weight="1"/>
+
     </com.android.phone.DTMFTwelveKeyDialerView>
 
 </SlidingDrawer>
index 2baebf379211e6a19ffa6c2d7b56ee48eccc2392..3a66fbcbde2913b938c9ad1d08b14475ba652f26 100644 (file)
@@ -4,9 +4,9 @@
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
-  
+
           http://www.apache.org/licenses/LICENSE-2.0
-  
+
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     android:layout_height="fill_parent"
     android:orientation="vertical"
 >
-    <LinearLayout
+
+    <!-- Text field above the keypad where the digits are displayed -->
+    <!-- TODO: Use a textAppearance to control the display of the number -->
+    <EditText android:id="@+id/digits"
         android:layout_width="fill_parent"
-        android:layout_height="66px"
-        android:layout_marginTop="3px"
-        android:layout_marginBottom="5px"
-        android:layout_marginLeft="3px"
-        android:layout_marginRight="3px"
-        android:orientation="horizontal"
-    >
-
-        <EditText android:id="@+id/digits"
-            android:layout_width="0dip"
-            android:layout_weight="1"
-            android:layout_height="66px"
-            android:maxLines="1"
-            android:scrollHorizontally="true"
-            android:textSize="28sp"
-            android:freezesText="true"
-            android:background="@drawable/btn_dial_textfield"
-            android:textColor="@color/dialer_button_text"
-            android:focusableInTouchMode="false"
-        />
-
-        <ImageButton android:id="@+id/backspace"
-            style="@android:style/Widget.Button.Inset"
-            android:layout_width="wrap_content"
-            android:layout_height="66px"
-            android:background="@drawable/btn_dial_delete"
-            android:src="@drawable/ic_delete_phone_number"
-            android:gravity="center"
-        />
-
-    </LinearLayout>
+        android:layout_height="67dip"
+        android:gravity="center"
+        android:maxLines="1"
+        android:scrollHorizontally="true"
+        android:textSize="33sp"
+        android:freezesText="true"
+        android:background="@drawable/btn_dial_textfield"
+        android:textColor="@color/dialer_button_text"
+        android:focusableInTouchMode="false"
+        android:layout_weight="0"
+    />
 
     <!-- Keypad section -->
     <include layout="@layout/dialpad" />
+
+    <!-- Horizontal row of buttons (Voicemail + DialButton + Delete.) -->
+    <include layout="@layout/voicemail_dial_delete" />
+
 </LinearLayout>
diff --git a/res/drawable-mdpi/incall_photo_border_lg.9.png b/res/drawable-mdpi/incall_photo_border_lg.9.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..03e1c7855f5a12d410677f5bbbefeece722f5d38
--- /dev/null
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- New style in-call DTMF dialpad, for devices that use the
+     InCallTouchUi widget, and thus do NOT use a SlidingDrawer
+     to contain the dialpad.
+
+     This provides basically the same UI elements as
+     dtmf_twelve_key_dialer.xml and dialpad.xml, but in a more
+     compact layout, and without the SlidingDrawer container.
+     -->
+<com.android.phone.DTMFTwelveKeyDialerView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/non_drawer_dtmf_dialer"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical"
+    android:layout_marginTop="1dip"
+    android:visibility="gone"
+    >
+
+    <!-- Display of the digits you've typed so far -->
+    <EditText
+        android:id="@+id/dtmfDialerField"
+        android:layout_width="fill_parent"
+        android:layout_height="32dp"
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="5dp"
+        android:layout_marginLeft="32dp"
+        android:layout_marginRight="32dp"
+        android:paddingRight="16dp"
+        android:paddingLeft="16dp"
+        android:maxLines="1"
+        android:scrollHorizontally="true"
+        android:textSize="24sp"
+        android:gravity="center"
+        android:freezesText="true"
+        android:background="@null"
+        android:textColor="@color/dtmf_dialer_display_text"
+        android:focusableInTouchMode="false"
+        android:clickable="false"/>
+
+    <!-- The dialpad itself -->
+    <com.android.phone.ButtonGridLayout
+        android:id="@+id/dialpad"
+        android:paddingLeft="7dp"
+        android:paddingRight="7dp"
+        android:paddingTop="6dp"
+        android:paddingBottom="6dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        >
+        <ImageButton android:id="@+id/one"
+                     android:layout_width="88dp"
+                     android:layout_height="50dp"
+                     android:src="@drawable/dial_num_1_no_vm"
+                     android:background="@drawable/btn_dial_green"
+                     />
+
+        <ImageButton android:id="@+id/two"
+                     android:layout_width="88dp"
+                     android:layout_height="50dp"
+                     android:src="@drawable/dial_num_2"
+                     android:background="@drawable/btn_dial_green"
+                     />
+
+        <ImageButton android:id="@+id/three"
+                     android:layout_width="88dp"
+                     android:layout_height="50dp"
+                     android:src="@drawable/dial_num_3"
+                     android:background="@drawable/btn_dial_green"
+                     />
+
+        <ImageButton android:id="@+id/four"
+                     android:layout_width="88dp"
+                     android:layout_height="50dp"
+                     android:src="@drawable/dial_num_4"
+                     android:background="@drawable/btn_dial_green"
+                     />
+
+        <ImageButton android:id="@+id/five"
+                     android:layout_width="88dp"
+                     android:layout_height="50dp"
+                     android:src="@drawable/dial_num_5"
+                     android:background="@drawable/btn_dial_green"
+                     />
+
+        <ImageButton android:id="@+id/six"
+                     android:layout_width="88dp"
+                     android:layout_height="50dp"
+                     android:src="@drawable/dial_num_6"
+                     android:background="@drawable/btn_dial_green"
+                     />
+
+        <ImageButton android:id="@+id/seven"
+                     android:layout_width="88dp"
+                     android:layout_height="50dp"
+                     android:src="@drawable/dial_num_7"
+                     android:background="@drawable/btn_dial_green"
+                     />
+
+        <ImageButton android:id="@+id/eight"
+                     android:layout_width="88dp"
+                     android:layout_height="50dp"
+                     android:src="@drawable/dial_num_8"
+                     android:background="@drawable/btn_dial_green"
+                     />
+
+        <ImageButton android:id="@+id/nine"
+                     android:layout_width="88dp"
+                     android:layout_height="50dp"
+                     android:src="@drawable/dial_num_9"
+                     android:background="@drawable/btn_dial_green"
+                     />
+
+        <ImageButton android:id="@+id/star"
+                     android:layout_width="88dp"
+                     android:layout_height="50dp"
+                     android:src="@drawable/dial_num_star"
+                     android:background="@drawable/btn_dial_green"
+                     />
+
+        <ImageButton android:id="@+id/zero"
+                     android:layout_width="88dp"
+                     android:layout_height="50dp"
+                     android:src="@drawable/dial_num_0"
+                     android:background="@drawable/btn_dial_green"
+                     />
+
+        <ImageButton android:id="@+id/pound"
+                     android:layout_width="88dp"
+                     android:layout_height="50dp"
+                     android:src="@drawable/dial_num_pound"
+                     android:background="@drawable/btn_dial_green"
+                     />
+    </com.android.phone.ButtonGridLayout>
+
+</com.android.phone.DTMFTwelveKeyDialerView>
diff --git a/res/drawable-mdpi/incall_photo_border_med.9.png b/res/drawable-mdpi/incall_photo_border_med.9.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..0d0422645749e80065485389713bf02203eb2c3e
--- /dev/null
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Horizontal row of buttons: Voicemail + DialButton + Delete (aka 'torpedo')
+     for the emergency dialer: The voicemail icon is dimmed down to 33%.
+
+     In HVGA layouts the vertical padding between the last dialpad row
+     and the torpedo is the same as the amount of padding between the dialpad's
+     buttons: 12dip.
+     However the dialpad's last row already specified 6dip of bottom padding
+     so here we pick up the remainder: 6dip.
+
+     The enclosing LinearLayout has a layout_weight of 1 which controls
+     how much the remaining free space will be placed below the torpedo.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/voicemailAndDialAndDelete"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center_horizontal"
+    android:layout_weight="1"
+    android:paddingTop="6dip"
+    android:orientation="horizontal">
+
+    <!-- Onscreen "Voicemail" button. The background is hardcoded
+             to disable and the foreground has been dimmed down to 30%.
+         The width is 75 (from the mocks) + 12 of padding from the
+         9patch, total is 87.
+    -->
+    <ImageButton android:id="@+id/voicemailButton"
+        android:layout_width="87dip"
+        android:layout_height="50dip"
+        android:layout_gravity="center_vertical|top"
+        android:state_enabled="false"
+        android:background="@drawable/btn_dial_action_left_disable"
+        android:tint="#ff555555"
+        android:src="@drawable/ic_dial_action_voice_mail" />
+
+    <!-- Onscreen "Dial" button, used on all platforms by
+         default. Its usage can be disabled using resources (see
+         config.xml.) -->
+    <ImageButton android:id="@+id/dialButton"
+        android:layout_width="116dip"
+        android:layout_height="50dip"
+        android:layout_gravity="center_vertical|top"
+        android:state_enabled="false"
+        android:background="@drawable/btn_dial_action"
+        android:src="@drawable/ic_dial_action_call" />
+
+    <!-- Onscreen "Backspace/Delete" button
+         The width is 75 (from the mocks) + 12 of padding from the
+         9patch, total is 87.
+    -->
+    <ImageButton android:id="@+id/deleteButton"
+        android:layout_width="87dip"
+        android:layout_height="50dip"
+        android:layout_gravity="center_vertical|top"
+        android:state_enabled="false"
+        android:background="@drawable/btn_dial_delete"
+        android:src="@drawable/ic_dial_action_delete" />
+</LinearLayout>
+
deleted file mode 100644 (file)
index b2bb7a0ed1dc6832e8a7507131d60542a1f631fc..0000000000000000000000000000000000000000
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- The dtmf dialer field that shows up in landscape mode.  In
-     portrait mode, the item is replaced with a simple <merge/>, so
-     its never inflated.  When in landscape, it's alpha value is
-     determined by the DTMFTwelveKeyDialer.DTMFKeyListener logic. -->
-<EditText
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/dtmfDialerField"
-    android:layout_height="48dip"
-    android:layout_width="372dip"
-    android:layout_centerHorizontal="true"
-    android:layout_gravity="center_horizontal"
-    android:layout_marginTop="202dip"
-    android:background="@drawable/btn_dial_textfield_normal_full_sm"
-    android:clickable="false"
-    android:freezesText="true"
-    android:maxLines="1"
-    android:paddingLeft="16px"
-    android:paddingRight="16px"
-    android:scrollHorizontally="true"
-    android:textColor="@color/dtmf_dialer_display_text"
-    android:textSize="22sp"/>
deleted file mode 100644 (file)
index e7576d4caf3ac010b6e60f0cd7fa79d5270135f9..0000000000000000000000000000000000000000
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- The landscape-oriented dtmf dialer does not exist.  The <merge/> tag
-     is just a dummy.  Instead, landscape mode uses dtmf_dialer_display
-     for the simple display of DTMF tones that the user dials on the
-     keyboard. -->
-<merge/>
index c9e04d44fa2a4fc5e8f5bee67f4e8e21d8c72e67..289ece18925558c6bc5b4684b3825395daaf188c 100644 (file)
@@ -4,9 +4,9 @@
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
-  
+
           http://www.apache.org/licenses/LICENSE-2.0
-  
+
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     android:layout_height="fill_parent"
     android:orientation="vertical"
 >
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="66px"
-        android:layout_marginTop="3px"
-        android:layout_marginBottom="5px"
-        android:layout_marginLeft="3px"
-        android:layout_marginRight="3px"
-        android:orientation="horizontal"
-    >
 
-        <EditText android:id="@+id/digits"
-            android:layout_width="0dip"
-            android:layout_weight="1"
-            android:layout_height="66px"
-            android:maxLines="1"
-            android:scrollHorizontally="true"
-            android:textSize="28sp"
-            android:freezesText="true"
-            android:background="@drawable/btn_dial_textfield"
-            android:textColor="@color/dialer_button_text"
-            android:hint="@string/dialerKeyboardHintText"
-        />
+    <!-- Text field above the keypad where the digits are displayed -->
+    <!-- TODO: Use a textAppearance to control the display of the number -->
+    <EditText android:id="@+id/digits"
+        android:layout_width="fill_parent"
+        android:layout_height="66dip"
+        android:layout_marginBottom="69dip"
+        android:layout_marginTop="1dip"
+        android:gravity="center"
+        android:maxLines="1"
+        android:scrollHorizontally="true"
+        android:textSize="28sp"
+        android:freezesText="true"
+        android:background="@drawable/btn_dial_textfield"
+        android:textColor="@color/dialer_button_text"
+        android:hint="@string/dialerKeyboardHintText"
+     />
 
-        <!--
-            The button goes at the right.
-        -->
-        <ImageButton android:id="@+id/backspace"
-            style="@android:style/Widget.Button.Inset"
-            android:layout_width="wrap_content"
-            android:layout_height="66px"
-            android:background="@drawable/btn_dial_delete"
-            android:src="@drawable/ic_delete_phone_number"
-            android:gravity="center"
-        />
+    <!-- Horizontal row of buttons (Voicemail + DialButton + Delete.) -->
+    <include layout="@layout/voicemail_dial_delete" />
 
-    </LinearLayout>
 </LinearLayout>
deleted file mode 100644 (file)
index 35eeab7c415f7d1270ddd512127bb3cd46f9c9d1..0000000000000000000000000000000000000000
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- XML resource file for the "person info" area of the main
-     CallCard of the in-call UI, which includes the photo and
-     name/number TextViews.
-     This is the LANDSCAPE mode version of this layout. -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="horizontal"
-              android:gravity="center_vertical"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              >
-
-    <!-- Photo, or else a generic placeholder image. -->
-    <!-- In landscape mode this ImageView is smaller than in portrait mode.
-         (Contact photos are 96x96 by default, but they're displayed
-         smaller than that here.  Note that the layout size of this
-         ImageView is *not* the actual size of the photo, but also
-         includes the extra space taken up by the incall_photo_border
-         background.)
-         And since the contact photo will need to be scaled down, we set
-         scaleType="centerInside" here (rather than the scaleType="center"
-         we use in portrait mode, where photos are drawn at their true size.) -->
-    <ImageView android:id="@+id/photo"
-               android:layout_width="96px"
-               android:layout_height="96px"
-               android:scaleType="centerInside"
-               android:background="@drawable/incall_photo_border"
-               />
-
-    <!-- Name and number, to the right of the photo. -->
-    <LinearLayout
-        android:orientation="vertical"
-        android:gravity="left"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="4dip">
-        >
-
-        <!-- Name (or the phone number, if we don't have a name to display). -->
-        <TextView android:id="@+id/name"
-                  android:gravity="center_horizontal"
-                  android:textAppearance="?android:attr/textAppearanceLarge"
-                  android:textSize="22sp"
-                  android:singleLine="true"
-                  android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:layout_marginBottom="4dip"
-                  android:paddingRight="4dip"
-                  />
-
-        <!-- Label (like "Mobile" or "Work", if present) and phone number, side by side -->
-        <LinearLayout android:orientation="horizontal"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:layout_gravity="center_horizontal"
-                      android:layout_marginTop="-4dip">
-            <TextView android:id="@+id/label"
-                      android:textAppearance="?android:attr/textAppearanceSmall"
-                      android:textSize="18sp"
-                      android:textColor="?android:attr/textColorSecondary"
-                      android:singleLine="true"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:paddingRight="6dip"
-                      />
-            <TextView android:id="@+id/phoneNumber"
-                      android:textAppearance="?android:attr/textAppearanceSmall"
-                      android:textSize="18sp"
-                      android:textColor="?android:attr/textColorSecondary"
-                      android:singleLine="true"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      />
-        </LinearLayout>
-
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/res/drawable-mdpi/red_selected.9.png b/res/drawable-mdpi/red_selected.9.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..43311bac18cbe2680e4cf693bcf7cc28dc01d51e
--- /dev/null
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Dialpad in the Phone app.
+     Tall screen version with taller buttons.
+ -->
+
+<com.android.phone.ButtonGridLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/dialpad"
+    android:paddingLeft="7dp"
+    android:paddingRight="7dp"
+    android:paddingTop="6dp"
+    android:paddingBottom="6dp"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center_horizontal"
+    android:layout_weight="1"
+>
+        <ImageButton android:id="@+id/one"
+            android:layout_width="88dp"
+            android:layout_height="58dp"
+            android:src="@drawable/dial_num_1_no_vm"
+            android:background="@drawable/btn_dial"
+        />
+
+        <ImageButton android:id="@+id/two"
+            android:layout_width="88dp"
+            android:layout_height="58dp"
+            android:src="@drawable/dial_num_2"
+            android:background="@drawable/btn_dial"
+        />
+
+        <ImageButton android:id="@+id/three"
+            android:layout_width="88dp"
+            android:layout_height="58dp"
+            android:src="@drawable/dial_num_3"
+            android:background="@drawable/btn_dial"
+        />
+
+        <ImageButton android:id="@+id/four"
+            android:layout_width="88dp"
+            android:layout_height="58dp"
+            android:src="@drawable/dial_num_4"
+            android:background="@drawable/btn_dial"
+        />
+
+        <ImageButton android:id="@+id/five"
+            android:layout_width="88dp"
+            android:layout_height="58dp"
+            android:src="@drawable/dial_num_5"
+            android:background="@drawable/btn_dial"
+        />
+
+        <ImageButton android:id="@+id/six"
+            android:layout_width="88dp"
+            android:layout_height="58dp"
+            android:src="@drawable/dial_num_6"
+            android:background="@drawable/btn_dial"
+        />
+
+        <ImageButton android:id="@+id/seven"
+            android:layout_width="88dp"
+            android:layout_height="58dp"
+            android:src="@drawable/dial_num_7"
+            android:background="@drawable/btn_dial"
+        />
+
+        <ImageButton android:id="@+id/eight"
+            android:layout_width="88dp"
+            android:layout_height="58dp"
+            android:src="@drawable/dial_num_8"
+            android:background="@drawable/btn_dial"
+        />
+
+        <ImageButton android:id="@+id/nine"
+            android:layout_width="88dp"
+            android:layout_height="58dp"
+            android:src="@drawable/dial_num_9"
+            android:background="@drawable/btn_dial"
+        />
+
+        <ImageButton android:id="@+id/star"
+            android:layout_width="88dp"
+            android:layout_height="58dp"
+            android:src="@drawable/dial_num_star"
+            android:background="@drawable/btn_dial"
+        />
+
+        <ImageButton android:id="@+id/zero"
+            android:layout_width="88dp"
+            android:layout_height="58dp"
+            android:src="@drawable/dial_num_0"
+            android:background="@drawable/btn_dial"
+        />
+
+        <ImageButton android:id="@+id/pound"
+            android:layout_width="88dp"
+            android:layout_height="58dp"
+            android:src="@drawable/dial_num_pound"
+            android:background="@drawable/btn_dial"
+        />
+</com.android.phone.ButtonGridLayout>
+
diff --git a/res/drawable/green_divider.png b/res/drawable/green_divider.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..adf145ff04b4c599938e209d88621605436384a5
--- /dev/null
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/top"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical"
+>
+
+    <!-- Text field above the keypad where the digits are displayed -->
+    <!-- TODO: Use a textAppearance to control the display of the number -->
+    <EditText android:id="@+id/digits"
+        android:layout_width="fill_parent"
+        android:layout_height="74dip"
+        android:gravity="center"
+        android:maxLines="1"
+        android:scrollHorizontally="true"
+        android:textSize="34sp"
+        android:freezesText="true"
+        android:background="@drawable/btn_dial_textfield"
+        android:textColor="@color/dialer_button_text"
+        android:focusableInTouchMode="false"
+        android:layout_weight="0"
+    />
+
+    <!-- Keypad section -->
+    <include layout="@layout/dialpad" />
+
+    <!-- Horizontal row of buttons (Voicemail + DialButton + Delete.) -->
+    <include layout="@layout/voicemail_dial_delete" />
+
+</LinearLayout>
diff --git a/res/drawable/incall_button.xml b/res/drawable/incall_button.xml
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..bd316eb4c868dbe832a3d040622292a24d242426
--- /dev/null
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- New style in-call DTMF dialpad, for devices that use the
+     InCallTouchUi widget, and thus do NOT use a SlidingDrawer
+     to contain the dialpad.
+
+     This provides basically the same UI elements as
+     dtmf_twelve_key_dialer.xml and dialpad.xml, but in a more
+     compact layout, and without the SlidingDrawer container.
+     -->
+<com.android.phone.DTMFTwelveKeyDialerView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/non_drawer_dtmf_dialer"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical"
+    android:layout_marginTop="1dip"
+    android:visibility="gone"
+    >
+
+    <!-- Display of the digits you've typed so far -->
+    <EditText
+        android:id="@+id/dtmfDialerField"
+        android:layout_width="fill_parent"
+        android:layout_height="32dp"
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="5dp"
+        android:layout_marginLeft="32dp"
+        android:layout_marginRight="32dp"
+        android:paddingRight="16dp"
+        android:paddingLeft="16dp"
+        android:maxLines="1"
+        android:scrollHorizontally="true"
+        android:textSize="24sp"
+        android:gravity="center"
+        android:freezesText="true"
+        android:background="@null"
+        android:textColor="@color/dtmf_dialer_display_text"
+        android:focusableInTouchMode="false"
+        android:clickable="false"/>
+
+    <!-- The dialpad itself -->
+    <com.android.phone.ButtonGridLayout
+        android:id="@+id/dialpad"
+        android:paddingLeft="7dp"
+        android:paddingRight="7dp"
+        android:paddingTop="6dp"
+        android:paddingBottom="6dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        >
+        <ImageButton android:id="@+id/one"
+                     android:layout_width="88dp"
+                     android:layout_height="58dp"
+                     android:src="@drawable/dial_num_1_no_vm"
+                     android:background="@drawable/btn_dial_green"
+                     />
+
+        <ImageButton android:id="@+id/two"
+                     android:layout_width="88dp"
+                     android:layout_height="58dp"
+                     android:src="@drawable/dial_num_2"
+                     android:background="@drawable/btn_dial_green"
+                     />
+
+        <ImageButton android:id="@+id/three"
+                     android:layout_width="88dp"
+                     android:layout_height="58dp"
+                     android:src="@drawable/dial_num_3"
+                     android:background="@drawable/btn_dial_green"
+                     />
+
+        <ImageButton android:id="@+id/four"
+                     android:layout_width="88dp"
+                     android:layout_height="58dp"
+                     android:src="@drawable/dial_num_4"
+                     android:background="@drawable/btn_dial_green"
+                     />
+
+        <ImageButton android:id="@+id/five"
+                     android:layout_width="88dp"
+                     android:layout_height="58dp"
+                     android:src="@drawable/dial_num_5"
+                     android:background="@drawable/btn_dial_green"
+                     />
+
+        <ImageButton android:id="@+id/six"
+                     android:layout_width="88dp"
+                     android:layout_height="58dp"
+                     android:src="@drawable/dial_num_6"
+                     android:background="@drawable/btn_dial_green"
+                     />
+
+        <ImageButton android:id="@+id/seven"
+                     android:layout_width="88dp"
+                     android:layout_height="58dp"
+                     android:src="@drawable/dial_num_7"
+                     android:background="@drawable/btn_dial_green"
+                     />
+
+        <ImageButton android:id="@+id/eight"
+                     android:layout_width="88dp"
+                     android:layout_height="58dp"
+                     android:src="@drawable/dial_num_8"
+                     android:background="@drawable/btn_dial_green"
+                     />
+
+        <ImageButton android:id="@+id/nine"
+                     android:layout_width="88dp"
+                     android:layout_height="58dp"
+                     android:src="@drawable/dial_num_9"
+                     android:background="@drawable/btn_dial_green"
+                     />
+
+        <ImageButton android:id="@+id/star"
+                     android:layout_width="88dp"
+                     android:layout_height="58dp"
+                     android:src="@drawable/dial_num_star"
+                     android:background="@drawable/btn_dial_green"
+                     />
+
+        <ImageButton android:id="@+id/zero"
+                     android:layout_width="88dp"
+                     android:layout_height="58dp"
+                     android:src="@drawable/dial_num_0"
+                     android:background="@drawable/btn_dial_green"
+                     />
+
+        <ImageButton android:id="@+id/pound"
+                     android:layout_width="88dp"
+                     android:layout_height="58dp"
+                     android:src="@drawable/dial_num_pound"
+                     android:background="@drawable/btn_dial_green"
+                     />
+    </com.android.phone.ButtonGridLayout>
+
+</com.android.phone.DTMFTwelveKeyDialerView>
diff --git a/res/drawable/incall_frame_bluetooth_short.9.png b/res/drawable/incall_frame_bluetooth_short.9.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..52aa38c91ef4d8d5ddf88c39e31ec432a01ded1c
--- /dev/null
+++ b/res/drawable/incall_frame_bluetooth_short.9.png
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Horizontal row of buttons: Voicemail + DialButton + Delete (aka 'torpedo')
+     for the emergency dialer: The voicemail icon is dimmed down to 33%.
+
+     Tall screen version with taller buttons and more padding between the dialpad:
+
+     In long layouts the vertical padding between the last dialpad row
+     and the torpedo is twice the amount of padding between the dialpad's
+     buttons: 2x12dip = 24dip.
+     However the dialpad's last row already specified 6dip of bottom padding
+     so here we pick up the remainder: 18dip.
+
+     The enclosing LinearLayout has a layout_weight of 1 which controls
+     how much the remaining free space will be placed below the torpedo.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/voicemailAndDialAndDelete"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center_horizontal"
+    android:layout_weight="1"
+    android:paddingTop="18dip"
+    android:orientation="horizontal">
+
+    <!-- Onscreen "Voicemail" button. The background is hardcoded to
+         disable and the foreground has been dimmed down to 30%.  The
+         width is 75 (from the mocks) + 12 of padding from the 9patch,
+         total is 87.
+    -->
+    <ImageButton android:id="@+id/voicemailButton"
+        android:layout_width="87dip"
+        android:layout_height="58dip"
+        android:layout_gravity="center_vertical|top"
+        android:state_enabled="false"
+        android:background="@drawable/btn_dial_action_left_disable"
+        android:tint="#ff555555"
+        android:src="@drawable/ic_dial_action_voice_mail" />
+
+    <!-- Onscreen "Dial" button, used on all platforms by
+         default. Its usage can be disabled using resources (see
+         config.xml.) -->
+    <ImageButton android:id="@+id/dialButton"
+        android:layout_width="116dip"
+        android:layout_height="58dip"
+        android:layout_gravity="center_vertical|top"
+        android:state_enabled="false"
+        android:background="@drawable/btn_dial_action"
+        android:src="@drawable/ic_dial_action_call" />
+
+    <!-- Onscreen "Backspace/Delete" button
+         The width is 75 (from the mocks) + 12 of padding from the
+         9patch, total is 87.
+    -->
+    <ImageButton android:id="@+id/deleteButton"
+        android:layout_width="87dip"
+        android:layout_height="58dip"
+        android:layout_gravity="center_vertical|top"
+        android:state_enabled="false"
+        android:background="@drawable/btn_dial_delete"
+        android:src="@drawable/ic_dial_action_delete" />
+</LinearLayout>
+
diff --git a/res/drawable/incall_frame_bluetooth_tall_land.9.png b/res/drawable/incall_frame_bluetooth_tall_land.9.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..5505628d311a3d77a378709ec648fb15f03684aa
--- /dev/null
+++ b/res/drawable/incall_frame_bluetooth_tall_land.9.png
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/top"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical"
+>
+
+    <!-- Text field above the keypad where the digits are displayed -->
+    <!-- TODO: Use a textAppearance to control the display of the number -->
+    <EditText android:id="@+id/digits"
+        android:layout_width="fill_parent"
+        android:layout_height="74dip"
+        android:layout_marginBottom="60dip"
+        android:layout_marginTop="1dip"
+        android:gravity="center"
+        android:maxLines="1"
+        android:scrollHorizontally="true"
+        android:textSize="34sp"
+        android:freezesText="true"
+        android:background="@drawable/btn_dial_textfield"
+        android:textColor="@color/dialer_button_text"
+        android:hint="@string/dialerKeyboardHintText"
+     />
+
+    <!-- Horizontal row of buttons (Voicemail + DialButton + Delete.) -->
+    <include layout="@layout/voicemail_dial_delete" />
+
+</LinearLayout>
diff --git a/res/drawable/incall_frame_bluetooth_tall_port.9.png b/res/drawable/incall_frame_bluetooth_tall_port.9.png
index 5c4df8effcf7adf8366aa17cea76592e91ea9967..06bc62bfa173046908e841bd6e6b42ca0d6f8379 100644 (file)
+++ b/res/drawable/incall_frame_bluetooth_tall_port.9.png
@@ -4,9 +4,9 @@
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
-  
+
           http://www.apache.org/licenses/LICENSE-2.0
-  
+
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,196 +19,83 @@
      child is the LinearLayout found here.  (In the CallCard constructor,
      we inflate this file and add it as a child.)
      TODO: consider just <include>ing this directly from incall_screen.xml? -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:gravity="center_horizontal"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     >
 
-    <!-- The CallCard displays info to the user about the currently active
-         phone call(s) on the device.  This vertical LinearLayout contains
-         the following subviews:
+    <!-- Info about the "secondary" call, displayed at the upper right of
+         the screen.  (If you're on a call with both lines in use, this
+         area displays the status and caller-id info of the call on hold.)
 
-         (1) The "main" or "full size" call card, which displays info
-             for the current foreground call, or the currently-ringing
-             incoming call (if there is one.)
+         This block of info needs to be Z-ordered underneath the
+         primaryCallInfo block, so it's the first child listed here. -->
+    <LinearLayout android:id="@+id/secondaryCallInfo"
+                  android:orientation="vertical"
+                  android:layout_width="160dp"
+                  android:layout_height="wrap_content"
+                  android:gravity="center_horizontal"
+                  android:layout_alignParentTop="true"
+                  android:layout_alignParentRight="true"
+                  android:layout_marginTop="16dp"
+                  >
+        <TextView android:id="@+id/secondaryCallStatus"
+              android:text="@string/onHold"
+              android:textAppearance="?android:attr/textAppearanceMedium"
+              android:textSize="14sp"
+              android:singleLine="true"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              />
 
-         (2) The "other call" info area for the current ongoing call,
-             visible only if an incoming call is ringing while you're
-             already using a phone line.
+        <TextView android:id="@+id/secondaryCallName"
+              android:textAppearance="?android:attr/textAppearanceMedium"
+              android:textSize="14sp"
+              android:singleLine="true"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:layout_marginTop="-2dip"
+              />
 
-         (3) The "other call" info area for the current call on hold,
-             visible only if there's a call on hold.
-    -->
+        <!-- Scaled-down photo, or else a generic placeholder image. -->
+        <ImageView android:id="@+id/secondaryCallPhoto"
+            android:layout_width="106dp"
+            android:layout_height="101dp"
+            android:layout_marginTop="-6dip"
+            android:background="@drawable/incall_photo_border_med"
+            />
+    </LinearLayout>
 
-    <!-- (1) The main call card -->
+    <!-- The main block of info about the "primary" or "active" call -->
     <LinearLayout
-        android:id="@+id/mainCallCard"
+        android:id="@+id/primaryCallInfo"
         android:orientation="vertical"
         android:gravity="center_horizontal"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:minHeight="300dip"
+        android:layout_alignParentTop="true"
+        android:layout_marginTop="18dip"
         >
 
         <!-- "Upper title" at the very top of the CallCard. -->
         <TextView android:id="@+id/upperTitle"
-                  android:paddingTop="6dip"
-                  android:paddingLeft="10dip"
-                  android:paddingRight="10dip"
                   android:textAppearance="?android:attr/textAppearanceLarge"
                   android:textSize="28sp"
                   android:singleLine="true"
                   android:layout_width="wrap_content"
                   android:layout_height="wrap_content"
-                  android:layout_marginTop="10dip"
+                  android:layout_marginBottom="10dip"
                   />
 
-        <!-- Placeholder to add some space between the title and "person info" area if
-             there's enough room. -->
-        <View
-            android:layout_width="fill_parent"
-            android:layout_height="1dip"
-            android:layout_weight="1" />
-
         <!-- "Person info": photo / name / number -->
         <include layout="@layout/call_card_person_info" />
 
-        <!-- Placeholder to add some space below the name/number if there's enough room. -->
-        <View
-            android:layout_width="fill_parent"
-            android:layout_height="1dip"
-            android:layout_weight="10" />
-
-        <!-- "Lower title" and elapsed time counter, used only in the
-             "call in progress" state. -->
-        <LinearLayout android:id="@+id/lowerTitleViewGroup"
-                      android:orientation="horizontal"
-                      android:gravity="center_vertical"
-                      android:layout_width="fill_parent"
-                      android:layout_height="wrap_content"
-                      android:layout_margin="6dip"
-                      >
-            <ImageView android:id="@+id/lowerTitleIcon"
-                       android:layout_width="wrap_content"
-                       android:layout_height="wrap_content"
-                       android:layout_marginRight="8dip"
-                />
-            <TextView android:id="@+id/lowerTitle"
-                      android:textAppearance="?android:attr/textAppearanceMedium"
-                      android:textSize="18sp"
-                      android:singleLine="true"
-                      android:layout_width="wrap_content"
-                      android:layout_weight="1"
-                      android:layout_height="wrap_content"
-                      android:gravity="left"
-                      />
-            <TextView android:id="@+id/elapsedTime"
-                      android:textAppearance="?android:attr/textAppearanceMedium"
-                      android:textSize="18sp"
-                      android:singleLine="true"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      />
-        </LinearLayout>
-
     </LinearLayout>    <!-- End of (1) The main call card -->
 
-
-    <!-- The "other call" info area. -->
-    <!-- There are two possible rows of information to display here:
-         (1) a one-liner with info about the "ongoing" (active) call,
-             displayed only if the main body of the CallCard is showing
-             an incoming call and a foreground call exists.
-         (2) a one-liner with info about the call on hold,
-             if there's a call on hold.
-         Note that BOTH can be visible in the rare case of an
-         incoming call while both lines are in use.  -->
-    <!-- The "other call" boxes are always bottom-aligned on the call card. -->
-
-    <!-- Fix the CallCard's updateState method to just fully
-         update EVERYTHING in the callcard based on the current phone
-         state: set the overall type of the CallCard, load up the main
-         caller info area, and load up and show or hide the "other call"
-         widgets as necessary.  -->
-
-    <!-- (2) Info area for the "ongoing" call -->
-    <LinearLayout android:id="@+id/otherCallOngoingInfoArea"
-                  android:orientation="horizontal"
-                  android:layout_width="fill_parent"
-                  android:layout_height="wrap_content"
-                  android:gravity="center_vertical"
-                  android:layout_marginTop="4dip"
-                  >
-        <ImageView android:id="@+id/otherCallOngoingIcon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="6dip"
-            android:layout_marginRight="8dip"
-            android:src="@drawable/ic_incall_ongoing"
-            />
-        <TextView android:id="@+id/otherCallOngoingName"
-              android:textAppearance="?android:attr/textAppearanceMedium"
-              android:textSize="18sp"
-              android:singleLine="true"
-              android:layout_width="wrap_content"
-              android:layout_weight="1"
-              android:layout_height="wrap_content"
-              android:gravity="left"
-              />
-        <TextView android:id="@+id/otherCallOngoingStatus"
-              android:text="@string/ongoing"
-              android:textAppearance="?android:attr/textAppearanceMedium"
-              android:textSize="18sp"
-              android:singleLine="true"
-              android:layout_marginRight="6dip"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              />
-    </LinearLayout>
-
-    <!-- (3) Info area for the "on hold" call -->
-    <LinearLayout android:id="@+id/otherCallOnHoldInfoArea"
-                  android:orientation="horizontal"
-                  android:layout_width="fill_parent"
-                  android:layout_height="wrap_content"
-                  android:gravity="center_vertical"
-                  android:layout_marginTop="4dip"
-                  >
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="6dip"
-            android:layout_marginRight="8dip"
-            android:src="@drawable/ic_incall_onhold"
-            />
-        <TextView android:id="@+id/otherCallOnHoldName"
-              android:textAppearance="?android:attr/textAppearanceMedium"
-              android:textSize="18sp"
-              android:singleLine="true"
-              android:layout_width="wrap_content"
-              android:layout_weight="1"
-              android:layout_height="wrap_content"
-              android:gravity="left"
-              />
-        <TextView android:id="@+id/otherCallOnHoldStatus"
-              android:text="@string/onHold"
-              android:textAppearance="?android:attr/textAppearanceMedium"
-              android:textSize="18sp"
-              android:singleLine="true"
-              android:layout_marginRight="6dip"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              />
-    </LinearLayout>
-
-    <!-- The hint about the Menu button, anchored to the bottom of the
-         CallCard.
-         This is used only in portrait mode.  (See updateMenuButtonHint());
-         in landscape mode we use the menuButtonHint from
-         incall_screen.xml, which is anchored to the bottom of the
-         screen.) -->
+    <!-- The hint about the Menu button, below all the call info.
+         This is only ever shown on devices that actually have a
+         menu while in-call, i.e. it's never shown on devices where the
+         InCallTouchUi is enabled (see InCallScreen.updateMenuButtonHint().) -->
     <TextView android:id="@+id/menuButtonHint"
               android:text="@string/menuButtonHint"
               android:textAppearance="?android:attr/textAppearanceMedium"
@@ -216,9 +103,10 @@
               android:textColor="?android:attr/textColorSecondary"
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
-              android:layout_gravity="center_horizontal"
-              android:layout_marginTop="4dip"
+              android:layout_below="@id/primaryCallInfo"
+              android:layout_marginTop="22dip"
+              android:layout_centerHorizontal="true"
               android:visibility="gone"
               />
 
-</LinearLayout>
+</RelativeLayout>
diff --git a/res/drawable/incall_frame_connected_short.9.png b/res/drawable/incall_frame_connected_short.9.png
index 69b0a8b08f982cc1a4894a1bd893e603832cd64e..353b07e36d29829781bd873505b730e4dc7ac6df 100644 (file)
+++ b/res/drawable/incall_frame_connected_short.9.png
@@ -16,38 +16,62 @@
 
 <!-- XML resource file for the "person info" area of the main
      CallCard of the in-call UI, which includes the photo and
-     name/number TextViews.
-     This is the PORTRAIT mode version of this layout. -->
+     name/number TextViews. -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:id="@+id/callCardPersonInfo"
               android:orientation="vertical"
               android:gravity="center_horizontal"
-              android:layout_width="wrap_content"
+              android:layout_width="fill_parent"
               android:layout_height="wrap_content"
               >
 
-    <!-- Photo, or else a generic placeholder image. -->
-    <!-- Contact photos are generally 96x96 (but may be smaller.)
-         The layout size of this ImageView is larger than that, though,
-         to account for the incall_photo_border background, which
-         adds a white border around the image (and a shadow around
-         the white border.) -->
-    <!-- TODO: Right now, for contact photos *smaller* than the standard
-         size, we still draw the picture frame at its normal size, so
-         you see the white border *and* lots of gray space around the
-         photo...  Need to confirm this is OK. -->
-    <ImageView android:id="@+id/photo"
-               android:layout_width="116px"
-               android:layout_height="116px"
-               android:scaleType="center"
-               android:background="@drawable/incall_photo_border"
-               />
-
-    <!-- Placeholder to add some space between the photo and name/number
-         if there's enough room. -->
-    <View
+    <!-- Photo, with elapsed time widget off to the side. -->
+    <RelativeLayout
         android:layout_width="fill_parent"
-        android:layout_height="1dip"
-        android:layout_weight="1" />
+        android:layout_height="172dp"
+        >
+        <!-- Photo, or else a generic placeholder image. -->
+        <!-- Contact photos are generally 96x96 (but may be smaller.)
+             The layout size of this ImageView is larger than that, though,
+             to account for the incall_photo_border background, which
+             adds a white border around the image (and a shadow around
+             the white border.) -->
+        <ImageView android:id="@+id/photo"
+                   android:layout_width="172dp"
+                   android:layout_height="166dp"
+                   android:layout_centerHorizontal="true"
+                   android:background="@drawable/incall_photo_border_lg"
+                   />
+
+        <!-- The big "Manage conference" button that we show in place of
+             the contact photo during a conference call (but only on
+             devices where the in-call touch UI is enabled.)  The photo is
+             invisible if this button is visible, and vice-versa. -->
+        <Button android:id="@+id/manageConferencePhotoButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerHorizontal="true"
+                android:text="@string/onscreenManageConferenceText"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textColor="?android:attr/textColorPrimary"
+                android:background="@drawable/manage_conference_photo_button"
+                android:layout_marginTop="16dip"
+            />
+
+        <!-- Elapsed time indication for a call in progress. -->
+        <TextView android:id="@+id/elapsedTime"
+                  android:textAppearance="?android:attr/textAppearanceMedium"
+                  android:textSize="15sp"
+                  android:textStyle="bold"
+                  android:singleLine="true"
+                  android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:layout_toRightOf="@id/photo"
+                  android:layout_alignParentBottom="true"
+                  android:layout_marginBottom="19dip"
+                  android:layout_marginLeft="-14dip"
+                  />
+    </RelativeLayout>
 
     <!-- Name (or the phone number, if we don't have a name to display). -->
     <TextView android:id="@+id/name"
@@ -57,7 +81,7 @@
               android:singleLine="true"
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
-              android:layout_marginBottom="6dip"
+              android:layout_marginTop="-22dip"
               android:paddingLeft="4dip"
               android:paddingRight="4dip"
               />
@@ -67,7 +91,7 @@
                   android:layout_width="wrap_content"
                   android:layout_height="wrap_content"
                   android:layout_gravity="center_horizontal"
-                  android:layout_marginTop="-4dip">
+                  android:layout_marginTop="-6dip">
         <TextView android:id="@+id/label"
                   android:textAppearance="?android:attr/textAppearanceSmall"
                   android:textSize="18sp"
@@ -87,4 +111,17 @@
                   />
     </LinearLayout>
 
+    <!-- Social status -->
+    <TextView android:id="@+id/socialStatus"
+              android:textAppearance="?android:attr/textAppearanceSmall"
+              android:textSize="16sp"
+              android:textColor="?android:attr/textColorSecondary"
+              android:maxLines="2"
+              android:ellipsize="end"
+              android:paddingLeft="10dip"
+              android:paddingRight="10dip"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              />
+
 </LinearLayout>
diff --git a/res/drawable/incall_frame_connected_tall_land.9.png b/res/drawable/incall_frame_connected_tall_land.9.png
deleted file mode 100644 (file)
index 4c69567302a78f23467aec4b3e1811c5011da904..0000000000000000000000000000000000000000
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Layout file for the contents of the in-call screen's sliding PopupWindow.
-     The PopupWindow contains a single CallCard, and "slides" up and down
-     (on top of the in-call UI elements) to lock/unlock the UI. -->
-<!-- The CallCard's contents come from call_card.xml. -->
-<com.android.phone.CallCard xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/callCard"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    />
diff --git a/res/drawable/incall_frame_connected_tall_port.9.png b/res/drawable/incall_frame_connected_tall_port.9.png
index dc11d4b39390829341d1bb8217737ee35a9c7128..a0714188639cfee78d3ffb4bd851abadbc91706e 100644 (file)
+++ b/res/drawable/incall_frame_connected_tall_port.9.png
@@ -32,20 +32,20 @@
             android:id="@+id/conferenceCallerDisconnect"
             style="?android:attr/buttonStyleSmall"
             android:src="@drawable/ic_button_conference_end"
-            android:layout_width="46px"
-            android:layout_height="46px"
-            android:layout_marginTop="2dip"
-            android:layout_marginLeft="6dip"
+            android:layout_width="46dp"
+            android:layout_height="46dp"
+            android:layout_marginTop="2dp"
+            android:layout_marginLeft="6dp"
             android:scaleType="center"/>
 
         <!-- Caller information -->
         <LinearLayout
             android:orientation="vertical"
-            android:layout_width="1dip"
+            android:layout_width="1dp"
             android:layout_weight="1"
             android:layout_height="wrap_content"
             android:gravity="center_vertical"
-            android:layout_marginLeft="4dip">
+            android:layout_marginLeft="4dp">
 
             <!-- Name or number of this caller -->
             <TextView
@@ -55,7 +55,7 @@
                 android:singleLine="true"
                 android:layout_width="wrap_content"
                 android:layout_height="fill_parent"
-                android:layout_marginRight="2dip"
+                android:layout_marginRight="2dp"
                 />
 
             <!-- Number of this caller if name is supplied above -->
@@ -73,8 +73,8 @@
                     android:singleLine="true"
                     android:layout_width="wrap_content"
                     android:layout_height="fill_parent"
-                    android:layout_marginRight="4dip"
-                    android:layout_marginBottom="2dip"/>
+                    android:layout_marginRight="4dp"
+                    android:layout_marginBottom="2dp"/>
 
                 <!-- Number -->
                 <TextView
@@ -93,10 +93,10 @@
             android:id="@+id/conferenceCallerSeparate"
             style="?android:attr/buttonStyleSmall"
             android:src="@drawable/ic_button_conference_private"
-            android:layout_width="46px"
-            android:layout_height="46px"
-            android:layout_marginTop="2dip"
-            android:layout_marginRight="6dip"
+            android:layout_width="46dp"
+            android:layout_height="46dp"
+            android:layout_marginTop="2dp"
+            android:layout_marginRight="6dp"
             android:scaleType="center"/>
 
     </LinearLayout>  <!-- End of single list element -->
@@ -107,7 +107,7 @@
         android:layout_height="wrap_content"
         android:src="@android:drawable/divider_horizontal_dark"
         android:scaleType="fitXY"
-        android:layout_marginTop="8dip"
-        android:layout_marginBottom="8dip"/>
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp"/>
 
 </LinearLayout>
diff --git a/res/drawable/incall_frame_ended_tall_land.9.png b/res/drawable/incall_frame_ended_tall_land.9.png
deleted file mode 100644 (file)
index 436a0ff57d0341755a1e3166245d4a6f0553204b..0000000000000000000000000000000000000000
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-            android:layout_width="fill_parent" 
-            android:layout_height="fill_parent" 
-            android:orientation="vertical" >
-    <TextView android:id="@+id/text_title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="20dip"
-            android:minHeight="50sp"
-            android:layout_gravity="center_vertical|center_horizontal"
-            android:text="@string/ecbm_mode_text" />
-    <ImageButton android:id="@+id/button_dial"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="80dip"
-            android:layout_gravity="center"
-            android:src="@drawable/picture_emergency" />  
-    <TextView android:id="@+id/text_instruction"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textSize="10sp"
-            android:layout_gravity="center_horizontal"
-            android:text="@string/ecbm_instruction_text" />
-            
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-            android:layout_width="fill_parent" 
-            android:layout_height="fill_parent" 
-            android:orientation="horizontal" >
-
-            <Button android:id="@+id/button_ok"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="10dip"
-                    android:layout_marginLeft="70dip"
-                    android:layout_gravity="left|bottom"
-                    android:text="@string/ecbm_ok_text" />
-            <Button android:id="@+id/button_exit"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="10dip"
-                    android:layout_marginLeft="70dip"
-                    android:layout_gravity="left|bottom"
-                    android:text="@string/ecbm_exit_text" />
-    </LinearLayout>        
-</LinearLayout>
-
-    
\ No newline at end of file
diff --git a/res/drawable/incall_frame_ended_tall_port.9.png b/res/drawable/incall_frame_ended_tall_port.9.png
index 0ef1bed8fe3e74e655e90512027581e457831d12..4b5120b7e6dcf9e71a4223c3f43194327aad9ce6 100644 (file)
+++ b/res/drawable/incall_frame_ended_tall_port.9.png
@@ -4,9 +4,9 @@
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
-  
+
           http://www.apache.org/licenses/LICENSE-2.0
-  
+
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,11 +20,7 @@
               android:layout_height="fill_parent"
               >
 
-    <!-- Main frame containing all in-call UI elements.
-         This is a FrameLayout with 2 children:
-           (1) inCallPanel: the main set of in-call UI elements
-           (2) manageConferencePanel: the "Manage conference" UI
-         Exactly one of these is visible at any given moment.  -->
+    <!-- Main frame containing the main set of in-call UI elements. -->
     <FrameLayout android:id="@+id/mainFrame"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
@@ -33,173 +29,47 @@
         android:paddingRight="6dip"
         >
 
-        <!-- (1) inCallPanel: the main set of in-call UI elements -->
+        <!-- (1) inCallPanel: the main set of in-call UI elements.
+             We update this view's background to indicate the state of the
+             current call; see updateInCallPanelBackground(). -->
         <RelativeLayout android:id="@+id/inCallPanel"
                         android:layout_width="fill_parent"
                         android:layout_height="fill_parent"
                         >
-
-            <!-- The CallCard (see call_card_popup.xml) is inserted
-                 here from Java code (see initInCallScreen()). -->
-
-            <!-- The hint about the Menu button, anchored to the bottom of
-                 the screen.  This is used only in landscape mode (see
-                 updateMenuButtonHint()); in portrait mode we use the
-                 menuButtonHint built-in to the CallCard. -->
-            <TextView android:id="@+id/menuButtonHint"
-                      android:text="@string/menuButtonKeyboardDialHint"
-                      android:textAppearance="?android:attr/textAppearanceMedium"
-                      android:textColor="?android:attr/textColorSecondary"
-                      android:layout_width="fill_parent"
-                      android:layout_height="wrap_content"
-                      android:gravity="center"
-                      android:visibility="gone"
-                      android:layout_alignParentBottom="true"
-                      />
-
+            <!-- The "Call Card", which displays info about the currently
+                 active phone call(s) on the device.  See call_card.xml. -->
+            <com.android.phone.CallCard android:id="@+id/callCard"
+                                        android:layout_width="fill_parent"
+                                        android:layout_height="fill_parent"
+                />
         </RelativeLayout>  <!-- End of inCallPanel -->
 
-        <!-- Simple, 1 line display for dtmf tones.  In portrait mode, this is just an
-             empty layout, in landscape mode this field fades in and out as needed. -->
-        <include layout="@layout/dtmf_dialer_display"/>
+         <!-- Contains all OTA-related UI elements for CDMA -->
+        <ViewStub android:id="@+id/otaCallCardStub"
+                  android:layout="@layout/otacall_card"
+                  android:layout_width="fill_parent"
+                  android:layout_height="fill_parent"
+                  />
 
     </FrameLayout>  <!-- End of mainFrame -->
 
-    <!-- (2) manageConferencePanel: the "Manage conference" UI.
-         This panel is displayed when the user clicks the
-         "Manage conference" button while on a conference call. -->
-    <RelativeLayout android:id="@+id/manageConferencePanel"
-                    android:layout_width="fill_parent"
-                    android:layout_height="fill_parent"
-                    android:visibility="gone"
-                    >
-        <!-- This original header (with timer) is currently not being used,
-             but may be of use in the future. -->
-        <!-- Header, including chronometer and List divider -->
-        <Chronometer
-            android:id="@+id/manageConferencePanelHeader"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:textSize="24sp"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center_horizontal"
-            android:layout_alignParentTop="true"
-            android:layout_marginTop="5dip"
-            android:layout_marginBottom="5dip"
-            android:visibility="gone"/>
-
-        <ImageView
-            android:id="@+id/manageConferencePanelDivider"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:src="@android:drawable/divider_horizontal_dark"
-            android:scaleType="fitXY"
-            android:layout_below="@id/manageConferencePanelHeader"
-            android:visibility="gone"/>
-        <!-- End of the original header -->
-
-        <!-- New header, based on the list separator in Contacts. -->
-        <LinearLayout android:id="@+id/manageConferenceHeader"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center_vertical"
-                android:background="@android:drawable/dark_header"
-                android:textColor="?android:attr/textColorSecondary"
-                android:textStyle="bold"
-                android:textSize="14sp"
-                android:paddingLeft="8dip"
-                android:text="@string/menu_manageConference"/>
-
-            <View
-                android:layout_width="fill_parent"
-                android:layout_height="1dip"
-                android:background="?android:attr/listDivider"/>
-
-        </LinearLayout>  <!-- End of new header -->
-
-        <!-- The scrollview wrapper for the list of callers on
-             the conference call (in case the list gets too long). -->
-        <ScrollView
-            android:id="@+id/conferenceList"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/manageConferenceHeader"
-            android:layout_marginTop="8dip"
-            android:layout_marginBottom="60dip">
-
-            <!-- The actual list of callers; this embedded LinearLayout
-                 required since scrollview only supports a single child. -->
-            <LinearLayout
-                android:orientation="vertical"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content">
-
-                <!-- A conference can have at most MAX_CALLERS_IN_CONFERENCE (= 5) callers,
-                     so just define all those UI elements here. -->
-
-                <!-- Caller 0 -->
-                <include
-                    layout="@layout/caller_in_conference"
-                    android:id="@+id/caller0"/>
-
-                <!-- Caller 1 -->
-                <include
-                    layout="@layout/caller_in_conference"
-                    android:id="@+id/caller1"/>
-
-                <!-- Caller 2 -->
-                <include
-                    layout="@layout/caller_in_conference"
-                    android:id="@+id/caller2"/>
-
-                <!-- Caller 3 -->
-                <include
-                    layout="@layout/caller_in_conference"
-                    android:id="@+id/caller3"/>
-
-                <!-- Caller 4 -->
-                <include
-                    layout="@layout/caller_in_conference"
-                    android:id="@+id/caller4"/>
-
-            </LinearLayout>  <!-- End of "list of callers on conference call" -->
-
-        </ScrollView>  <!-- End of scrolling list wrapper for the linear layout -->
-
-        <!-- The grey footer, background behind the "Back to call" button -->
-        <View
-            android:layout_width="fill_parent"
-            android:layout_height="54dip"
-            android:gravity="center_vertical"
-            android:layout_alignParentBottom="true"
-            android:background="@android:drawable/dark_header"/>
-
-        <!-- The "Back to call" button -->
-        <Button android:id="@+id/manage_done"
-            style="?android:attr/buttonStyleSmall"
-            android:text="@string/caller_manage_manage_done_text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:layout_centerHorizontal="true"
-            android:paddingTop="14dip"
-            android:paddingBottom="18dip"
-            android:paddingLeft="42dip"
-            android:paddingRight="42dip"/>
-
-    </RelativeLayout>  <!-- End of manageConferencePanel -->
+    <!-- The "Manage conference" UI.  This panel is displayed (instead of
+         the inCallPanel) when the user clicks the "Manage conference"
+         button while on a conference call. -->
+    <ViewStub android:id="@+id/manageConferencePanelStub"
+              android:layout="@layout/manage_conference_panel"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent"
+              />
 
     <!-- The sliding drawer control containing the DTMF dialpad.
          Note this isn't a child of mainFrame, which ensures that it'll be
          able to use the full width of the screen.  (And a SlidingDrawer
          widget needs to be be a direct child of a FrameLayout anyway.)
-         In portrait mode, this is visible; in landscape mode, this is
-         just an empty layout.-->
+         This is used only on devices that do *not* have an onscreen
+         InCallTouchUi widget.-->
+    <!-- TODO: this should be a ViewStub, and should only get inflated
+         on platforms that need it. -->
     <include layout="@layout/dtmf_twelve_key_dialer"/>
 
     <!-- Finally, the "touch lock" overlay, drawn on top of the DTMF
@@ -230,13 +100,35 @@
             />
     </RelativeLayout>
 
-    <!-- Onscreen "answer" UI, used on devices with no hardware CALL
-         button while an incoming call is ringing. -->
-    <ViewStub android:id="@+id/onscreenAnswerUiStub"
-        android:inflatedId="@+id/onscreenAnswerUiContainer"
-        android:layout="@layout/onscreen_answer_ui"
+    <!-- In-call onscreen touch controls, used on some platforms. -->
+    <!-- TODO: if this widget ends up being totally unused on some platforms,
+         then this should probably be a ViewStub. -->
+    <com.android.phone.InCallTouchUi
+        android:id="@+id/inCallTouchUi"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         />
 
+    <!-- Frame where the provider's badge will be
+         inflated. The badge must fit in the available height.
+         The badge is displayed for 5s on top of the contact's
+         picture.
+      -->
+    <FrameLayout android:id="@+id/inCallProviderOverlay"
+        android:background="@drawable/dialog_bg_calling_via"
+        android:layout_width="fill_parent"
+        android:layout_height="88dip"
+        android:layout_marginTop="8dip"
+        android:layout_gravity="top"
+        android:visibility="gone">
+        <TextView android:id="@+id/callingVia"
+            android:text="@string/calling_via_template"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:textAppearance="?android:attr/textAppearanceMediumInverse"
+            />
+    </FrameLayout>
+
 </FrameLayout>
diff --git a/res/drawable/incall_frame_hold_short.9.png b/res/drawable/incall_frame_hold_short.9.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..461ccd6d656d59fee2d9c14027d3f7c8a7926558
--- /dev/null
+++ b/res/drawable/incall_frame_hold_short.9.png
@@ -0,0 +1,227 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- In-call onscreen touch UI elements, used on some platforms.
+
+     This layout is a fullscreen overlay, drawn on top of the
+     non-touch-sensitive parts of the in-call UI (i.e. the call card).
+
+     The top-level View here is a FrameLayout with 2 children:
+       (1) incomingCallWidget: the UI displayed while an incoming call is ringing
+       (2) inCallControls: the widgets visible while a regular call (or calls) is in progress
+     Exactly one of these is visible at any given moment.
+     -->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    >
+
+    <!--
+        (1) incomingCallWidget: the UI displayed while an incoming call is ringing.
+        By measuring from the top, this will layou out properly on hvga and wvga devices,
+        includign taller ones.
+    -->
+    <com.android.internal.widget.RotarySelector
+        android:id="@+id/incomingCallWidget"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        android:layout_alignParentTop="true"
+        android:layout_marginTop="286dip" 
+        />
+
+    <!--
+        (2) inCallControls: the widgets visible while a regular call
+        (or calls) is in progress
+    -->
+    <RelativeLayout android:id="@+id/inCallControls"
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent"
+                    android:layout_alignParentTop="true"
+                    android:visibility="gone"
+                    >
+        <!-- Buttons visible in the upper corners of the screen (in some states). -->
+        <!-- These are small round ImageButtons with a text label floating
+             off to the side. -->
+
+        <!-- "Hold" (upper left) -->
+        <!-- (Note "Hold", "Swap" and "Merge" are never available at
+             the same time.  That's why it's OK for them to be in the
+             same position onscreen.) -->
+        <LinearLayout android:id="@+id/holdButtonContainer"
+                style="@style/InCallRoundButtonContainer"
+                android:layout_alignParentLeft="true"
+                android:layout_marginLeft="10dip"
+                android:visibility="gone">
+            <ImageButton android:id="@+id/holdButton"
+                    style="@style/InCallRoundTouchButton"
+                    android:src="@drawable/ic_in_call_touch_round_hold" />
+            <TextView android:id="@+id/holdButtonLabel"
+                    style="@style/InCallRoundButtonLabel" />
+        </LinearLayout>
+
+        <!-- "Swap" (upper left) -->
+        <LinearLayout android:id="@+id/swapButtonContainer"
+                style="@style/InCallRoundButtonContainer"
+                android:layout_alignParentLeft="true"
+                android:layout_marginLeft="10dip"
+                android:visibility="gone">
+            <ImageButton android:id="@+id/swapButton"
+                    style="@style/InCallRoundTouchButton"
+                    android:src="@drawable/ic_in_call_touch_round_swap" />
+            <TextView android:id="@+id/swapButtonLabel"
+                style="@style/InCallRoundButtonLabel" />
+        </LinearLayout>
+
+        <!-- "Merge" (upper left) CDMA specific -->
+        <LinearLayout android:id="@+id/cdmaMergeButtonContainer"
+                style="@style/InCallRoundButtonContainer"
+                android:layout_alignParentLeft="true"
+                android:layout_marginLeft="10dip"
+                android:visibility="gone">
+            <ImageButton android:id="@+id/cdmaMergeButton"
+                    style="@style/InCallRoundTouchButton"
+                    android:src="@drawable/ic_in_call_touch_round_merge_call" />
+            <TextView
+                style="@style/InCallRoundButtonLabel"
+                android:text="@string/onscreenMergeCallsText" />
+        </LinearLayout>
+
+        <!-- DTMF dialpad shown in the upper part of the screen
+             (above the main cluster of buttons.) -->
+        <!-- TODO: this should be a ViewStub, and should only get inflated
+             when first needed. -->
+        <include layout="@layout/non_drawer_dialpad"/>
+
+        <!-- Main cluster of onscreen buttons on the lower part of the screen. -->
+        <LinearLayout android:id="@+id/bottomButtons"
+                      android:orientation="vertical"
+                      android:layout_width="fill_parent"
+                      android:layout_height="wrap_content"
+                      android:layout_alignParentBottom="true"
+                      android:paddingLeft="4dip"
+                      android:paddingRight="4dip"
+                      android:paddingBottom="4dip"
+                      >
+
+            <LinearLayout android:id="@+id/inCallControlsRow1"
+                          android:orientation="horizontal"
+                          android:layout_width="fill_parent"
+                          android:layout_height="wrap_content"
+                          >
+                <!-- The buttons in the top row all have an icon *and* a
+                     text label, so we use a <Button> with a "top"
+                     compound drawable (rather than an ImageButton, which
+                     can't have a label.)  Some buttons set the icon image
+                     here; others do it from Java if the image depends on
+                     the current state of the call. -->
+
+                <!-- The upper-left button in the main cluster is either
+                     "Add" or "Merge", depending on the state of the call. -->
+                <FrameLayout
+                    android:layout_width="1dip"
+                    android:layout_weight="1"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dip"
+                    android:layout_marginBottom="8dip"
+                    android:layout_marginLeft="8dip"
+                    android:layout_marginRight="8dip"
+                    >
+                    <!-- "Add Call" -->
+                    <Button android:id="@+id/addButton"
+                            style="@style/InCallTouchButton"
+                            android:layout_width="fill_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="0dip"
+                            android:layout_marginBottom="0dip"
+                            android:layout_marginLeft="0dip"
+                            android:layout_marginRight="0dip"
+                            android:text="@string/onscreenAddCallText"
+                            android:drawableTop="@drawable/ic_in_call_touch_add_call"
+                            />
+                    <!-- "Merge calls". GSM specific -->
+                    <Button android:id="@+id/mergeButton"
+                            style="@style/InCallTouchButton"
+                            android:layout_width="fill_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="0dip"
+                            android:layout_marginBottom="0dip"
+                            android:layout_marginLeft="0dip"
+                            android:layout_marginRight="0dip"
+                            android:text="@string/onscreenMergeCallsText"
+                            android:drawableTop="@drawable/ic_in_call_touch_merge_call"
+                            />
+                </FrameLayout>
+
+                <!-- "End call" -->
+                <Button android:id="@+id/endButton"
+                        style="@style/InCallTouchButton"
+                        android:layout_width="1dip"
+                        android:layout_weight="1"
+                        android:layout_height="wrap_content"
+                        android:text="@string/onscreenEndCallText"
+                        android:drawableTop="@drawable/ic_in_call_touch_end"
+                        android:textColor="@color/incall_endButtonLabel"
+                        />
+
+                <!-- "Dialpad" -->
+                <Button android:id="@+id/dialpadButton"
+                        style="@style/InCallTouchButton"
+                        android:layout_width="1dip"
+                        android:layout_weight="1"
+                        android:layout_height="wrap_content"
+                        android:text="@string/onscreenShowDialpadText"
+                        />
+            </LinearLayout>
+            <LinearLayout android:id="@+id/inCallControlsRow2"
+                          android:orientation="horizontal"
+                          android:layout_width="fill_parent"
+                          android:layout_height="wrap_content"
+                          >
+                <!-- "Bluetooth" -->
+                <ToggleButton android:id="@+id/bluetoothButton"
+                        style="@style/InCallTouchToggleButton"
+                        android:layout_width="1dip"
+                        android:layout_weight="1"
+                        android:layout_height="wrap_content"
+                        android:textOn="@string/onscreenBluetoothText"
+                        android:textOff="@string/onscreenBluetoothText"
+                        />
+                <!-- "Mute" -->
+                <ToggleButton android:id="@+id/muteButton"
+                        style="@style/InCallTouchToggleButton"
+                        android:layout_width="1dip"
+                        android:layout_weight="1"
+                        android:layout_height="wrap_content"
+                        android:textOn="@string/onscreenMuteText"
+                        android:textOff="@string/onscreenMuteText"
+                        />
+                <!-- "Speaker" -->
+                <ToggleButton android:id="@+id/speakerButton"
+                        style="@style/InCallTouchToggleButton"
+                        android:layout_width="1dip"
+                        android:layout_weight="1"
+                        android:layout_height="wrap_content"
+                        android:textOn="@string/onscreenSpeakerText"
+                        android:textOff="@string/onscreenSpeakerText"
+                        />
+            </LinearLayout>
+
+        </LinearLayout>
+
+    </RelativeLayout>
+
+</RelativeLayout>
diff --git a/res/drawable/incall_frame_hold_tall_land.9.png b/res/drawable/incall_frame_hold_tall_land.9.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..d2cd70aa30ef3f7e637898de97243852cac5f3df
--- /dev/null
+++ b/res/drawable/incall_frame_hold_tall_land.9.png
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- The "Manage conference" UI.  This panel is displayed (instead of
+     the inCallPanel) when the user clicks the "Manage conference"
+     button while on a conference call. -->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                android:id="@+id/manageConferencePanel"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:visibility="gone"
+                >
+    <!-- This original header (with timer) is currently not being used,
+         but may be of use in the future. -->
+    <!-- Header, including chronometer and List divider -->
+    <Chronometer
+        android:id="@+id/manageConferencePanelHeader"
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:textSize="24sp"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:l