From 50e5dc2470dfce3f70f86bdaa5f261e367e47a5a Mon Sep 17 00:00:00 2001 From: Christine Chen Date: Tue, 10 Sep 2013 15:22:53 -0700 Subject: Addes xxhdpi assets for InCallUi - Changes how End Call button looks. Bug: 10491107 Change-Id: I02271ba346a8879b4642f4a642513211d2a328fc --- InCallUI/res/drawable-hdpi/endcall_active.png | Bin 326 -> 0 bytes .../drawable-hdpi/endcall_background_texture.png | Bin 99 -> 0 bytes InCallUI/res/drawable-hdpi/endcall_disable.png | Bin 325 -> 0 bytes InCallUI/res/drawable-hdpi/ic_in_call_bt_dk.png | Bin 0 -> 1540 bytes .../drawable-hdpi/ic_incoming_call_bluetooth.png | Bin 2560 -> 0 bytes .../res/drawable-hdpi/list_pressed_holo_dark.9.png | Bin 159 -> 164 bytes .../list_selector_disabled_holo_dark.9.png | Bin 189 -> 185 bytes InCallUI/res/drawable-hdpi/picture_unknown.png | Bin 54065 -> 3503 bytes InCallUI/res/drawable-mdpi/endcall_active.png | Bin 325 -> 0 bytes .../drawable-mdpi/endcall_background_texture.png | Bin 90 -> 0 bytes InCallUI/res/drawable-mdpi/endcall_disable.png | Bin 325 -> 0 bytes InCallUI/res/drawable-mdpi/ic_in_call_bt_dk.png | Bin 0 -> 1047 bytes .../drawable-mdpi/ic_incoming_call_bluetooth.png | Bin 1245 -> 0 bytes .../res/drawable-mdpi/list_pressed_holo_dark.9.png | Bin 158 -> 163 bytes .../list_selector_disabled_holo_dark.9.png | Bin 172 -> 171 bytes InCallUI/res/drawable-mdpi/picture_unknown.png | Bin 34983 -> 2378 bytes InCallUI/res/drawable-xhdpi/endcall_active.png | Bin 326 -> 0 bytes .../drawable-xhdpi/endcall_background_texture.png | Bin 114 -> 0 bytes InCallUI/res/drawable-xhdpi/endcall_disable.png | Bin 326 -> 0 bytes InCallUI/res/drawable-xhdpi/ic_in_call_bt_dk.png | Bin 0 -> 2066 bytes .../drawable-xhdpi/ic_incoming_call_bluetooth.png | Bin 5919 -> 0 bytes .../drawable-xhdpi/list_pressed_holo_dark.9.png | Bin 163 -> 168 bytes InCallUI/res/drawable-xhdpi/picture_unknown.png | Bin 84465 -> 4829 bytes .../drawable-xxhdpi/dial_background_texture.png | Bin 0 -> 1112 bytes .../res/drawable-xxhdpi/dial_num_0_no_plus_wht.png | Bin 0 -> 3056 bytes InCallUI/res/drawable-xxhdpi/dial_num_0_wht.png | Bin 0 -> 3168 bytes .../res/drawable-xxhdpi/dial_num_1_no_vm_wht.png | Bin 0 -> 1632 bytes InCallUI/res/drawable-xxhdpi/dial_num_1_wht.png | Bin 0 -> 2830 bytes InCallUI/res/drawable-xxhdpi/dial_num_2_wht.png | Bin 0 -> 3923 bytes InCallUI/res/drawable-xxhdpi/dial_num_3_wht.png | Bin 0 -> 3930 bytes InCallUI/res/drawable-xxhdpi/dial_num_4_wht.png | Bin 0 -> 2752 bytes InCallUI/res/drawable-xxhdpi/dial_num_5_wht.png | Bin 0 -> 3683 bytes InCallUI/res/drawable-xxhdpi/dial_num_6_wht.png | Bin 0 -> 4366 bytes InCallUI/res/drawable-xxhdpi/dial_num_7_wht.png | Bin 0 -> 3534 bytes InCallUI/res/drawable-xxhdpi/dial_num_8_wht.png | Bin 0 -> 4560 bytes InCallUI/res/drawable-xxhdpi/dial_num_9_wht.png | Bin 0 -> 4734 bytes .../res/drawable-xxhdpi/dial_num_pound_wht.png | Bin 0 -> 2123 bytes InCallUI/res/drawable-xxhdpi/dial_num_star_wht.png | Bin 0 -> 2425 bytes .../res/drawable-xxhdpi/ic_ab_dialer_holo_dark.png | Bin 0 -> 3642 bytes .../ic_active_state_dialer_holo_dark.png | Bin 0 -> 1460 bytes .../drawable-xxhdpi/ic_add_contact_holo_dark.png | Bin 0 -> 3610 bytes .../res/drawable-xxhdpi/ic_bluetooth_holo_dark.png | Bin 0 -> 4372 bytes InCallUI/res/drawable-xxhdpi/ic_dial_end_call.png | Bin 0 -> 4504 bytes .../res/drawable-xxhdpi/ic_dialpad_holo_dark.png | Bin 0 -> 1873 bytes .../res/drawable-xxhdpi/ic_end_call_holo_dark.png | Bin 0 -> 2939 bytes .../res/drawable-xxhdpi/ic_groups_holo_dark.png | Bin 0 -> 5294 bytes .../drawable-xxhdpi/ic_hold_pause_holo_dark.png | Bin 0 -> 1336 bytes InCallUI/res/drawable-xxhdpi/ic_in_call_bt_dk.png | Bin 0 -> 2880 bytes .../ic_in_call_touch_handle_normal.png | Bin 0 -> 21330 bytes .../drawable-xxhdpi/ic_incall_switch_holo_dark.png | Bin 0 -> 4253 bytes .../ic_lockscreen_answer_activated.png | Bin 0 -> 2638 bytes .../ic_lockscreen_answer_normal.png | Bin 0 -> 2808 bytes .../ic_lockscreen_decline_activated.png | Bin 0 -> 2042 bytes .../ic_lockscreen_decline_normal.png | Bin 0 -> 2131 bytes .../ic_lockscreen_text_activated.png | Bin 0 -> 2049 bytes .../drawable-xxhdpi/ic_lockscreen_text_normal.png | Bin 0 -> 1994 bytes .../res/drawable-xxhdpi/ic_merge_holo_dark.png | Bin 0 -> 3153 bytes .../ic_more_indicator_holo_dark.png | Bin 0 -> 1486 bytes InCallUI/res/drawable-xxhdpi/ic_mute_holo_dark.png | Bin 0 -> 3595 bytes .../ic_sound_bluetooth_holo_dark.png | Bin 0 -> 4753 bytes .../drawable-xxhdpi/ic_sound_handset_holo_dark.png | Bin 0 -> 3380 bytes .../res/drawable-xxhdpi/ic_sound_holo_dark.png | Bin 0 -> 5042 bytes .../ic_sound_off_speakerphone_holo_dark.png | Bin 0 -> 3549 bytes .../ic_sound_speakerphone_holo_dark.png | Bin 0 -> 4759 bytes .../res/drawable-xxhdpi/ic_split_holo_dark.png | Bin 0 -> 3167 bytes .../res/drawable-xxhdpi/list_focused_holo.9.png | Bin 0 -> 1147 bytes .../drawable-xxhdpi/list_pressed_holo_dark.9.png | Bin 0 -> 987 bytes .../list_selector_disabled_holo_dark.9.png | Bin 0 -> 1137 bytes .../res/drawable-xxhdpi/picture_conference.png | Bin 0 -> 15299 bytes InCallUI/res/drawable-xxhdpi/picture_unknown.png | Bin 0 -> 22053 bytes .../res/drawable-xxhdpi/stat_sys_phone_call.png | Bin 0 -> 2089 bytes .../drawable-xxhdpi/stat_sys_phone_call_end.png | Bin 0 -> 3458 bytes .../stat_sys_phone_call_on_hold.png | Bin 0 -> 2160 bytes InCallUI/res/drawable/end_call_background.xml | 31 +++++---------------- InCallUI/res/layout/call_button_fragment.xml | 1 - InCallUI/res/values/colors.xml | 9 ++++++ .../src/com/android/incallui/CallCardFragment.java | 2 +- 77 files changed, 17 insertions(+), 26 deletions(-) delete mode 100644 InCallUI/res/drawable-hdpi/endcall_active.png delete mode 100644 InCallUI/res/drawable-hdpi/endcall_background_texture.png delete mode 100644 InCallUI/res/drawable-hdpi/endcall_disable.png create mode 100644 InCallUI/res/drawable-hdpi/ic_in_call_bt_dk.png delete mode 100644 InCallUI/res/drawable-hdpi/ic_incoming_call_bluetooth.png delete mode 100644 InCallUI/res/drawable-mdpi/endcall_active.png delete mode 100644 InCallUI/res/drawable-mdpi/endcall_background_texture.png delete mode 100644 InCallUI/res/drawable-mdpi/endcall_disable.png create mode 100644 InCallUI/res/drawable-mdpi/ic_in_call_bt_dk.png delete mode 100644 InCallUI/res/drawable-mdpi/ic_incoming_call_bluetooth.png delete mode 100644 InCallUI/res/drawable-xhdpi/endcall_active.png delete mode 100644 InCallUI/res/drawable-xhdpi/endcall_background_texture.png delete mode 100644 InCallUI/res/drawable-xhdpi/endcall_disable.png create mode 100644 InCallUI/res/drawable-xhdpi/ic_in_call_bt_dk.png delete mode 100644 InCallUI/res/drawable-xhdpi/ic_incoming_call_bluetooth.png create mode 100644 InCallUI/res/drawable-xxhdpi/dial_background_texture.png create mode 100644 InCallUI/res/drawable-xxhdpi/dial_num_0_no_plus_wht.png create mode 100644 InCallUI/res/drawable-xxhdpi/dial_num_0_wht.png create mode 100644 InCallUI/res/drawable-xxhdpi/dial_num_1_no_vm_wht.png create mode 100644 InCallUI/res/drawable-xxhdpi/dial_num_1_wht.png create mode 100644 InCallUI/res/drawable-xxhdpi/dial_num_2_wht.png create mode 100644 InCallUI/res/drawable-xxhdpi/dial_num_3_wht.png create mode 100644 InCallUI/res/drawable-xxhdpi/dial_num_4_wht.png create mode 100644 InCallUI/res/drawable-xxhdpi/dial_num_5_wht.png create mode 100644 InCallUI/res/drawable-xxhdpi/dial_num_6_wht.png create mode 100644 InCallUI/res/drawable-xxhdpi/dial_num_7_wht.png create mode 100644 InCallUI/res/drawable-xxhdpi/dial_num_8_wht.png create mode 100644 InCallUI/res/drawable-xxhdpi/dial_num_9_wht.png create mode 100644 InCallUI/res/drawable-xxhdpi/dial_num_pound_wht.png create mode 100644 InCallUI/res/drawable-xxhdpi/dial_num_star_wht.png create mode 100644 InCallUI/res/drawable-xxhdpi/ic_ab_dialer_holo_dark.png create mode 100644 InCallUI/res/drawable-xxhdpi/ic_active_state_dialer_holo_dark.png create mode 100644 InCallUI/res/drawable-xxhdpi/ic_add_contact_holo_dark.png create mode 100644 InCallUI/res/drawable-xxhdpi/ic_bluetooth_holo_dark.png create mode 100644 InCallUI/res/drawable-xxhdpi/ic_dial_end_call.png create mode 100644 InCallUI/res/drawable-xxhdpi/ic_dialpad_holo_dark.png create mode 100644 InCallUI/res/drawable-xxhdpi/ic_end_call_holo_dark.png create mode 100644 InCallUI/res/drawable-xxhdpi/ic_groups_holo_dark.png create mode 100644 InCallUI/res/drawable-xxhdpi/ic_hold_pause_holo_dark.png create mode 100644 InCallUI/res/drawable-xxhdpi/ic_in_call_bt_dk.png create mode 100644 InCallUI/res/drawable-xxhdpi/ic_in_call_touch_handle_normal.png create mode 100644 InCallUI/res/drawable-xxhdpi/ic_incall_switch_holo_dark.png create mode 100644 InCallUI/res/drawable-xxhdpi/ic_lockscreen_answer_activated.png create mode 100644 InCallUI/res/drawable-xxhdpi/ic_lockscreen_answer_normal.png create mode 100644 InCallUI/res/drawable-xxhdpi/ic_lockscreen_decline_activated.png create mode 100644 InCallUI/res/drawable-xxhdpi/ic_lockscreen_decline_normal.png create mode 100644 InCallUI/res/drawable-xxhdpi/ic_lockscreen_text_activated.png create mode 100644 InCallUI/res/drawable-xxhdpi/ic_lockscreen_text_normal.png create mode 100644 InCallUI/res/drawable-xxhdpi/ic_merge_holo_dark.png create mode 100644 InCallUI/res/drawable-xxhdpi/ic_more_indicator_holo_dark.png create mode 100644 InCallUI/res/drawable-xxhdpi/ic_mute_holo_dark.png create mode 100644 InCallUI/res/drawable-xxhdpi/ic_sound_bluetooth_holo_dark.png create mode 100644 InCallUI/res/drawable-xxhdpi/ic_sound_handset_holo_dark.png create mode 100644 InCallUI/res/drawable-xxhdpi/ic_sound_holo_dark.png create mode 100644 InCallUI/res/drawable-xxhdpi/ic_sound_off_speakerphone_holo_dark.png create mode 100644 InCallUI/res/drawable-xxhdpi/ic_sound_speakerphone_holo_dark.png create mode 100644 InCallUI/res/drawable-xxhdpi/ic_split_holo_dark.png create mode 100644 InCallUI/res/drawable-xxhdpi/list_focused_holo.9.png create mode 100644 InCallUI/res/drawable-xxhdpi/list_pressed_holo_dark.9.png create mode 100644 InCallUI/res/drawable-xxhdpi/list_selector_disabled_holo_dark.9.png create mode 100644 InCallUI/res/drawable-xxhdpi/picture_conference.png create mode 100644 InCallUI/res/drawable-xxhdpi/picture_unknown.png create mode 100644 InCallUI/res/drawable-xxhdpi/stat_sys_phone_call.png create mode 100644 InCallUI/res/drawable-xxhdpi/stat_sys_phone_call_end.png create mode 100644 InCallUI/res/drawable-xxhdpi/stat_sys_phone_call_on_hold.png diff --git a/InCallUI/res/drawable-hdpi/endcall_active.png b/InCallUI/res/drawable-hdpi/endcall_active.png deleted file mode 100644 index 38f1e1ce1..000000000 Binary files a/InCallUI/res/drawable-hdpi/endcall_active.png and /dev/null differ diff --git a/InCallUI/res/drawable-hdpi/endcall_background_texture.png b/InCallUI/res/drawable-hdpi/endcall_background_texture.png deleted file mode 100644 index 095b0b627..000000000 Binary files a/InCallUI/res/drawable-hdpi/endcall_background_texture.png and /dev/null differ diff --git a/InCallUI/res/drawable-hdpi/endcall_disable.png b/InCallUI/res/drawable-hdpi/endcall_disable.png deleted file mode 100644 index 6a0f65867..000000000 Binary files a/InCallUI/res/drawable-hdpi/endcall_disable.png and /dev/null differ diff --git a/InCallUI/res/drawable-hdpi/ic_in_call_bt_dk.png b/InCallUI/res/drawable-hdpi/ic_in_call_bt_dk.png new file mode 100644 index 000000000..4901a2c1c Binary files /dev/null and b/InCallUI/res/drawable-hdpi/ic_in_call_bt_dk.png differ diff --git a/InCallUI/res/drawable-hdpi/ic_incoming_call_bluetooth.png b/InCallUI/res/drawable-hdpi/ic_incoming_call_bluetooth.png deleted file mode 100644 index 050c3e765..000000000 Binary files a/InCallUI/res/drawable-hdpi/ic_incoming_call_bluetooth.png and /dev/null differ diff --git a/InCallUI/res/drawable-hdpi/list_pressed_holo_dark.9.png b/InCallUI/res/drawable-hdpi/list_pressed_holo_dark.9.png index 5654cd694..3c52029a0 100644 Binary files a/InCallUI/res/drawable-hdpi/list_pressed_holo_dark.9.png and b/InCallUI/res/drawable-hdpi/list_pressed_holo_dark.9.png differ diff --git a/InCallUI/res/drawable-hdpi/list_selector_disabled_holo_dark.9.png b/InCallUI/res/drawable-hdpi/list_selector_disabled_holo_dark.9.png index f6fd30dcd..c8afb46f8 100644 Binary files a/InCallUI/res/drawable-hdpi/list_selector_disabled_holo_dark.9.png and b/InCallUI/res/drawable-hdpi/list_selector_disabled_holo_dark.9.png differ diff --git a/InCallUI/res/drawable-hdpi/picture_unknown.png b/InCallUI/res/drawable-hdpi/picture_unknown.png index 278c1215c..ba46da151 100644 Binary files a/InCallUI/res/drawable-hdpi/picture_unknown.png and b/InCallUI/res/drawable-hdpi/picture_unknown.png differ diff --git a/InCallUI/res/drawable-mdpi/endcall_active.png b/InCallUI/res/drawable-mdpi/endcall_active.png deleted file mode 100644 index a82738bfc..000000000 Binary files a/InCallUI/res/drawable-mdpi/endcall_active.png and /dev/null differ diff --git a/InCallUI/res/drawable-mdpi/endcall_background_texture.png b/InCallUI/res/drawable-mdpi/endcall_background_texture.png deleted file mode 100644 index efa65025f..000000000 Binary files a/InCallUI/res/drawable-mdpi/endcall_background_texture.png and /dev/null differ diff --git a/InCallUI/res/drawable-mdpi/endcall_disable.png b/InCallUI/res/drawable-mdpi/endcall_disable.png deleted file mode 100644 index bd1a2f380..000000000 Binary files a/InCallUI/res/drawable-mdpi/endcall_disable.png and /dev/null differ diff --git a/InCallUI/res/drawable-mdpi/ic_in_call_bt_dk.png b/InCallUI/res/drawable-mdpi/ic_in_call_bt_dk.png new file mode 100644 index 000000000..820ebe1a4 Binary files /dev/null and b/InCallUI/res/drawable-mdpi/ic_in_call_bt_dk.png differ diff --git a/InCallUI/res/drawable-mdpi/ic_incoming_call_bluetooth.png b/InCallUI/res/drawable-mdpi/ic_incoming_call_bluetooth.png deleted file mode 100644 index 4b317c110..000000000 Binary files a/InCallUI/res/drawable-mdpi/ic_incoming_call_bluetooth.png and /dev/null differ diff --git a/InCallUI/res/drawable-mdpi/list_pressed_holo_dark.9.png b/InCallUI/res/drawable-mdpi/list_pressed_holo_dark.9.png index 6e77525d2..c231328ae 100644 Binary files a/InCallUI/res/drawable-mdpi/list_pressed_holo_dark.9.png and b/InCallUI/res/drawable-mdpi/list_pressed_holo_dark.9.png differ diff --git a/InCallUI/res/drawable-mdpi/list_selector_disabled_holo_dark.9.png b/InCallUI/res/drawable-mdpi/list_selector_disabled_holo_dark.9.png index 92da2f0dd..c9002b7a3 100644 Binary files a/InCallUI/res/drawable-mdpi/list_selector_disabled_holo_dark.9.png and b/InCallUI/res/drawable-mdpi/list_selector_disabled_holo_dark.9.png differ diff --git a/InCallUI/res/drawable-mdpi/picture_unknown.png b/InCallUI/res/drawable-mdpi/picture_unknown.png index cc5dd09a6..995df75b3 100644 Binary files a/InCallUI/res/drawable-mdpi/picture_unknown.png and b/InCallUI/res/drawable-mdpi/picture_unknown.png differ diff --git a/InCallUI/res/drawable-xhdpi/endcall_active.png b/InCallUI/res/drawable-xhdpi/endcall_active.png deleted file mode 100644 index 5347ed29e..000000000 Binary files a/InCallUI/res/drawable-xhdpi/endcall_active.png and /dev/null differ diff --git a/InCallUI/res/drawable-xhdpi/endcall_background_texture.png b/InCallUI/res/drawable-xhdpi/endcall_background_texture.png deleted file mode 100644 index c94eeeceb..000000000 Binary files a/InCallUI/res/drawable-xhdpi/endcall_background_texture.png and /dev/null differ diff --git a/InCallUI/res/drawable-xhdpi/endcall_disable.png b/InCallUI/res/drawable-xhdpi/endcall_disable.png deleted file mode 100644 index fa10196c7..000000000 Binary files a/InCallUI/res/drawable-xhdpi/endcall_disable.png and /dev/null differ diff --git a/InCallUI/res/drawable-xhdpi/ic_in_call_bt_dk.png b/InCallUI/res/drawable-xhdpi/ic_in_call_bt_dk.png new file mode 100644 index 000000000..8ca78f4e8 Binary files /dev/null and b/InCallUI/res/drawable-xhdpi/ic_in_call_bt_dk.png differ diff --git a/InCallUI/res/drawable-xhdpi/ic_incoming_call_bluetooth.png b/InCallUI/res/drawable-xhdpi/ic_incoming_call_bluetooth.png deleted file mode 100644 index 662e7bb60..000000000 Binary files a/InCallUI/res/drawable-xhdpi/ic_incoming_call_bluetooth.png and /dev/null differ diff --git a/InCallUI/res/drawable-xhdpi/list_pressed_holo_dark.9.png b/InCallUI/res/drawable-xhdpi/list_pressed_holo_dark.9.png index e4b33935a..4f8551010 100644 Binary files a/InCallUI/res/drawable-xhdpi/list_pressed_holo_dark.9.png and b/InCallUI/res/drawable-xhdpi/list_pressed_holo_dark.9.png differ diff --git a/InCallUI/res/drawable-xhdpi/picture_unknown.png b/InCallUI/res/drawable-xhdpi/picture_unknown.png index b8ee922fd..b4bd3666a 100644 Binary files a/InCallUI/res/drawable-xhdpi/picture_unknown.png and b/InCallUI/res/drawable-xhdpi/picture_unknown.png differ diff --git a/InCallUI/res/drawable-xxhdpi/dial_background_texture.png b/InCallUI/res/drawable-xxhdpi/dial_background_texture.png new file mode 100644 index 000000000..437741c83 Binary files /dev/null and b/InCallUI/res/drawable-xxhdpi/dial_background_texture.png differ diff --git a/InCallUI/res/drawable-xxhdpi/dial_num_0_no_plus_wht.png b/InCallUI/res/drawable-xxhdpi/dial_num_0_no_plus_wht.png new file mode 100644 index 000000000..36d65c784 Binary files /dev/null and b/InCallUI/res/drawable-xxhdpi/dial_num_0_no_plus_wht.png differ diff --git a/InCallUI/res/drawable-xxhdpi/dial_num_0_wht.png b/InCallUI/res/drawable-xxhdpi/dial_num_0_wht.png new file mode 100644 index 000000000..373723282 Binary files /dev/null and b/InCallUI/res/drawable-xxhdpi/dial_num_0_wht.png differ diff --git a/InCallUI/res/drawable-xxhdpi/dial_num_1_no_vm_wht.png b/InCallUI/res/drawable-xxhdpi/dial_num_1_no_vm_wht.png new file mode 100644 index 000000000..a41c6786c Binary files /dev/null and b/InCallUI/res/drawable-xxhdpi/dial_num_1_no_vm_wht.png differ diff --git a/InCallUI/res/drawable-xxhdpi/dial_num_1_wht.png b/InCallUI/res/drawable-xxhdpi/dial_num_1_wht.png new file mode 100644 index 000000000..e2afb2fc4 Binary files /dev/null and b/InCallUI/res/drawable-xxhdpi/dial_num_1_wht.png differ diff --git a/InCallUI/res/drawable-xxhdpi/dial_num_2_wht.png b/InCallUI/res/drawable-xxhdpi/dial_num_2_wht.png new file mode 100644 index 000000000..e4dd69e0f Binary files /dev/null and b/InCallUI/res/drawable-xxhdpi/dial_num_2_wht.png differ diff --git a/InCallUI/res/drawable-xxhdpi/dial_num_3_wht.png b/InCallUI/res/drawable-xxhdpi/dial_num_3_wht.png new file mode 100644 index 000000000..42b37c7b9 Binary files /dev/null and b/InCallUI/res/drawable-xxhdpi/dial_num_3_wht.png differ diff --git a/InCallUI/res/drawable-xxhdpi/dial_num_4_wht.png b/InCallUI/res/drawable-xxhdpi/dial_num_4_wht.png new file mode 100644 index 000000000..37bf49c4c Binary files /dev/null and b/InCallUI/res/drawable-xxhdpi/dial_num_4_wht.png differ diff --git a/InCallUI/res/drawable-xxhdpi/dial_num_5_wht.png b/InCallUI/res/drawable-xxhdpi/dial_num_5_wht.png new file mode 100644 index 000000000..a1638488d Binary files /dev/null and b/InCallUI/res/drawable-xxhdpi/dial_num_5_wht.png differ diff --git a/InCallUI/res/drawable-xxhdpi/dial_num_6_wht.png b/InCallUI/res/drawable-xxhdpi/dial_num_6_wht.png new file mode 100644 index 000000000..3ff9d39b2 Binary files /dev/null and b/InCallUI/res/drawable-xxhdpi/dial_num_6_wht.png differ diff --git a/InCallUI/res/drawable-xxhdpi/dial_num_7_wht.png b/InCallUI/res/drawable-xxhdpi/dial_num_7_wht.png new file mode 100644 index 000000000..bc9162199 Binary files /dev/null and b/InCallUI/res/drawable-xxhdpi/dial_num_7_wht.png differ diff --git a/InCallUI/res/drawable-xxhdpi/dial_num_8_wht.png b/InCallUI/res/drawable-xxhdpi/dial_num_8_wht.png new file mode 100644 index 000000000..84b2f1cb7 Binary files /dev/null and b/InCallUI/res/drawable-xxhdpi/dial_num_8_wht.png differ diff --git a/InCallUI/res/drawable-xxhdpi/dial_num_9_wht.png b/InCallUI/res/drawable-xxhdpi/dial_num_9_wht.png new file mode 100644 index 000000000..ced1c9451 Binary files /dev/null and b/InCallUI/res/drawable-xxhdpi/dial_num_9_wht.png differ diff --git a/InCallUI/res/drawable-xxhdpi/dial_num_pound_wht.png b/InCallUI/res/drawable-xxhdpi/dial_num_pound_wht.png new file mode 100644 index 000000000..ab2758c38 Binary files /dev/null and b/InCallUI/res/drawable-xxhdpi/dial_num_pound_wht.png differ diff --git a/InCallUI/res/drawable-xxhdpi/dial_num_star_wht.png b/InCallUI/res/drawable-xxhdpi/dial_num_star_wht.png new file mode 100644 index 000000000..75ce19836 Binary files /dev/null and b/InCallUI/res/drawable-xxhdpi/dial_num_star_wht.png differ diff --git a/InCallUI/res/drawable-xxhdpi/ic_ab_dialer_holo_dark.png b/InCallUI/res/drawable-xxhdpi/ic_ab_dialer_holo_dark.png new file mode 100644 index 000000000..3c8021c39 Binary files /dev/null and b/InCallUI/res/drawable-xxhdpi/ic_ab_dialer_holo_dark.png differ diff --git a/InCallUI/res/drawable-xxhdpi/ic_active_state_dialer_holo_dark.png b/InCallUI/res/drawable-xxhdpi/ic_active_state_dialer_holo_dark.png new file mode 100644 index 000000000..26a22baaf Binary files /dev/null and b/InCallUI/res/drawable-xxhdpi/ic_active_state_dialer_holo_dark.png differ diff --git a/InCallUI/res/drawable-xxhdpi/ic_add_contact_holo_dark.png b/InCallUI/res/drawable-xxhdpi/ic_add_contact_holo_dark.png new file mode 100644 index 000000000..6eed276d8 Binary files /dev/null and b/InCallUI/res/drawable-xxhdpi/ic_add_contact_holo_dark.png differ diff --git a/InCallUI/res/drawable-xxhdpi/ic_bluetooth_holo_dark.png b/InCallUI/res/drawable-xxhdpi/ic_bluetooth_holo_dark.png new file mode 100644 index 000000000..4b668b722 Binary files /dev/null and b/InCallUI/res/drawable-xxhdpi/ic_bluetooth_holo_dark.png differ diff --git a/InCallUI/res/drawable-xxhdpi/ic_dial_end_call.png b/InCallUI/res/drawable-xxhdpi/ic_dial_end_call.png new file mode 100644 index 000000000..5b350225d Binary files /dev/null and b/InCallUI/res/drawable-xxhdpi/ic_dial_end_call.png differ diff --git a/InCallUI/res/drawable-xxhdpi/ic_dialpad_holo_dark.png b/InCallUI/res/drawable-xxhdpi/ic_dialpad_holo_dark.png new file mode 100644 index 000000000..c8ce94bb7 Binary files /dev/null and b/InCallUI/res/drawable-xxhdpi/ic_dialpad_holo_dark.png differ diff --git a/InCallUI/res/drawable-xxhdpi/ic_end_call_holo_dark.png b/InCallUI/res/drawable-xxhdpi/ic_end_call_holo_dark.png new file mode 100644 index 000000000..da3b0750b Binary files /dev/null and b/InCallUI/res/drawable-xxhdpi/ic_end_call_holo_dark.png differ diff --git a/InCallUI/res/drawable-xxhdpi/ic_groups_holo_dark.png b/InCallUI/res/drawable-xxhdpi/ic_groups_holo_dark.png new file mode 100644 index 000000000..6fdaa5d35 Binary files /dev/null and b/InCallUI/res/drawable-xxhdpi/ic_groups_holo_dark.png differ diff --git a/InCallUI/res/drawable-xxhdpi/ic_hold_pause_holo_dark.png b/InCallUI/res/drawable-xxhdpi/ic_hold_pause_holo_dark.png new file mode 100644 index 000000000..e38bea11e Binary files /dev/null and b/InCallUI/res/drawable-xxhdpi/ic_hold_pause_holo_dark.png differ diff --git a/InCallUI/res/drawable-xxhdpi/ic_in_call_bt_dk.png b/InCallUI/res/drawable-xxhdpi/ic_in_call_bt_dk.png new file mode 100644 index 000000000..e94c77214 Binary files /dev/null and b/InCallUI/res/drawable-xxhdpi/ic_in_call_bt_dk.png differ diff --git a/InCallUI/res/drawable-xxhdpi/ic_in_call_touch_handle_normal.png b/InCallUI/res/drawable-xxhdpi/ic_in_call_touch_handle_normal.png new file mode 100644 index 000000000..b41967bd8 Binary files /dev/null and b/InCallUI/res/drawable-xxhdpi/ic_in_call_touch_handle_normal.png differ diff --git a/InCallUI/res/drawable-xxhdpi/ic_incall_switch_holo_dark.png b/InCallUI/res/drawable-xxhdpi/ic_incall_switch_holo_dark.png new file mode 100644 index 000000000..67c1d7de6 Binary files /dev/null and b/InCallUI/res/drawable-xxhdpi/ic_incall_switch_holo_dark.png differ diff --git a/InCallUI/res/drawable-xxhdpi/ic_lockscreen_answer_activated.png b/InCallUI/res/drawable-xxhdpi/ic_lockscreen_answer_activated.png new file mode 100644 index 000000000..173b54c66 Binary files /dev/null and b/InCallUI/res/drawable-xxhdpi/ic_lockscreen_answer_activated.png differ diff --git a/InCallUI/res/drawable-xxhdpi/ic_lockscreen_answer_normal.png b/InCallUI/res/drawable-xxhdpi/ic_lockscreen_answer_normal.png new file mode 100644 index 000000000..fcf436742 Binary files /dev/null and b/InCallUI/res/drawable-xxhdpi/ic_lockscreen_answer_normal.png differ diff --git a/InCallUI/res/drawable-xxhdpi/ic_lockscreen_decline_activated.png b/InCallUI/res/drawable-xxhdpi/ic_lockscreen_decline_activated.png new file mode 100644 index 000000000..74b6cf085 Binary files /dev/null and b/InCallUI/res/drawable-xxhdpi/ic_lockscreen_decline_activated.png differ diff --git a/InCallUI/res/drawable-xxhdpi/ic_lockscreen_decline_normal.png b/InCallUI/res/drawable-xxhdpi/ic_lockscreen_decline_normal.png new file mode 100644 index 000000000..54b796524 Binary files /dev/null and b/InCallUI/res/drawable-xxhdpi/ic_lockscreen_decline_normal.png differ diff --git a/InCallUI/res/drawable-xxhdpi/ic_lockscreen_text_activated.png b/InCallUI/res/drawable-xxhdpi/ic_lockscreen_text_activated.png new file mode 100644 index 000000000..a4e00486d Binary files /dev/null and b/InCallUI/res/drawable-xxhdpi/ic_lockscreen_text_activated.png differ diff --git a/InCallUI/res/drawable-xxhdpi/ic_lockscreen_text_normal.png b/InCallUI/res/drawable-xxhdpi/ic_lockscreen_text_normal.png new file mode 100644 index 000000000..20ff3091f Binary files /dev/null and b/InCallUI/res/drawable-xxhdpi/ic_lockscreen_text_normal.png differ diff --git a/InCallUI/res/drawable-xxhdpi/ic_merge_holo_dark.png b/InCallUI/res/drawable-xxhdpi/ic_merge_holo_dark.png new file mode 100644 index 000000000..a7125afde Binary files /dev/null and b/InCallUI/res/drawable-xxhdpi/ic_merge_holo_dark.png differ diff --git a/InCallUI/res/drawable-xxhdpi/ic_more_indicator_holo_dark.png b/InCallUI/res/drawable-xxhdpi/ic_more_indicator_holo_dark.png new file mode 100644 index 000000000..42f65499f Binary files /dev/null and b/InCallUI/res/drawable-xxhdpi/ic_more_indicator_holo_dark.png differ diff --git a/InCallUI/res/drawable-xxhdpi/ic_mute_holo_dark.png b/InCallUI/res/drawable-xxhdpi/ic_mute_holo_dark.png new file mode 100644 index 000000000..678b7fbb8 Binary files /dev/null and b/InCallUI/res/drawable-xxhdpi/ic_mute_holo_dark.png differ diff --git a/InCallUI/res/drawable-xxhdpi/ic_sound_bluetooth_holo_dark.png b/InCallUI/res/drawable-xxhdpi/ic_sound_bluetooth_holo_dark.png new file mode 100644 index 000000000..8646bec41 Binary files /dev/null and b/InCallUI/res/drawable-xxhdpi/ic_sound_bluetooth_holo_dark.png differ diff --git a/InCallUI/res/drawable-xxhdpi/ic_sound_handset_holo_dark.png b/InCallUI/res/drawable-xxhdpi/ic_sound_handset_holo_dark.png new file mode 100644 index 000000000..7f89efbed Binary files /dev/null and b/InCallUI/res/drawable-xxhdpi/ic_sound_handset_holo_dark.png differ diff --git a/InCallUI/res/drawable-xxhdpi/ic_sound_holo_dark.png b/InCallUI/res/drawable-xxhdpi/ic_sound_holo_dark.png new file mode 100644 index 000000000..5d36d4ecc Binary files /dev/null and b/InCallUI/res/drawable-xxhdpi/ic_sound_holo_dark.png differ diff --git a/InCallUI/res/drawable-xxhdpi/ic_sound_off_speakerphone_holo_dark.png b/InCallUI/res/drawable-xxhdpi/ic_sound_off_speakerphone_holo_dark.png new file mode 100644 index 000000000..caf36e02a Binary files /dev/null and b/InCallUI/res/drawable-xxhdpi/ic_sound_off_speakerphone_holo_dark.png differ diff --git a/InCallUI/res/drawable-xxhdpi/ic_sound_speakerphone_holo_dark.png b/InCallUI/res/drawable-xxhdpi/ic_sound_speakerphone_holo_dark.png new file mode 100644 index 000000000..e6e974f8b Binary files /dev/null and b/InCallUI/res/drawable-xxhdpi/ic_sound_speakerphone_holo_dark.png differ diff --git a/InCallUI/res/drawable-xxhdpi/ic_split_holo_dark.png b/InCallUI/res/drawable-xxhdpi/ic_split_holo_dark.png new file mode 100644 index 000000000..16b6ac083 Binary files /dev/null and b/InCallUI/res/drawable-xxhdpi/ic_split_holo_dark.png differ diff --git a/InCallUI/res/drawable-xxhdpi/list_focused_holo.9.png b/InCallUI/res/drawable-xxhdpi/list_focused_holo.9.png new file mode 100644 index 000000000..3e4ca684e Binary files /dev/null and b/InCallUI/res/drawable-xxhdpi/list_focused_holo.9.png differ diff --git a/InCallUI/res/drawable-xxhdpi/list_pressed_holo_dark.9.png b/InCallUI/res/drawable-xxhdpi/list_pressed_holo_dark.9.png new file mode 100644 index 000000000..e751a6029 Binary files /dev/null and b/InCallUI/res/drawable-xxhdpi/list_pressed_holo_dark.9.png differ diff --git a/InCallUI/res/drawable-xxhdpi/list_selector_disabled_holo_dark.9.png b/InCallUI/res/drawable-xxhdpi/list_selector_disabled_holo_dark.9.png new file mode 100644 index 000000000..26234b1e3 Binary files /dev/null and b/InCallUI/res/drawable-xxhdpi/list_selector_disabled_holo_dark.9.png differ diff --git a/InCallUI/res/drawable-xxhdpi/picture_conference.png b/InCallUI/res/drawable-xxhdpi/picture_conference.png new file mode 100644 index 000000000..e3dd68659 Binary files /dev/null and b/InCallUI/res/drawable-xxhdpi/picture_conference.png differ diff --git a/InCallUI/res/drawable-xxhdpi/picture_unknown.png b/InCallUI/res/drawable-xxhdpi/picture_unknown.png new file mode 100644 index 000000000..41275930d Binary files /dev/null and b/InCallUI/res/drawable-xxhdpi/picture_unknown.png differ diff --git a/InCallUI/res/drawable-xxhdpi/stat_sys_phone_call.png b/InCallUI/res/drawable-xxhdpi/stat_sys_phone_call.png new file mode 100644 index 000000000..934838484 Binary files /dev/null and b/InCallUI/res/drawable-xxhdpi/stat_sys_phone_call.png differ diff --git a/InCallUI/res/drawable-xxhdpi/stat_sys_phone_call_end.png b/InCallUI/res/drawable-xxhdpi/stat_sys_phone_call_end.png new file mode 100644 index 000000000..1f3a81bb5 Binary files /dev/null and b/InCallUI/res/drawable-xxhdpi/stat_sys_phone_call_end.png differ diff --git a/InCallUI/res/drawable-xxhdpi/stat_sys_phone_call_on_hold.png b/InCallUI/res/drawable-xxhdpi/stat_sys_phone_call_on_hold.png new file mode 100644 index 000000000..6403ce81d Binary files /dev/null and b/InCallUI/res/drawable-xxhdpi/stat_sys_phone_call_on_hold.png differ diff --git a/InCallUI/res/drawable/end_call_background.xml b/InCallUI/res/drawable/end_call_background.xml index 33ec22fa1..53f4e5432 100644 --- a/InCallUI/res/drawable/end_call_background.xml +++ b/InCallUI/res/drawable/end_call_background.xml @@ -17,29 +17,12 @@ - - - - - - - - - - - - - - - - - - + + + + + diff --git a/InCallUI/res/layout/call_button_fragment.xml b/InCallUI/res/layout/call_button_fragment.xml index 6a76a1ca2..2174a9700 100644 --- a/InCallUI/res/layout/call_button_fragment.xml +++ b/InCallUI/res/layout/call_button_fragment.xml @@ -63,7 +63,6 @@ android:orientation="horizontal" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/dialpad_background" android:paddingStart="@dimen/button_cluster_side_padding" android:paddingEnd="@dimen/button_cluster_side_padding" > diff --git a/InCallUI/res/values/colors.xml b/InCallUI/res/values/colors.xml index 4040008ad..9d149a472 100644 --- a/InCallUI/res/values/colors.xml +++ b/InCallUI/res/values/colors.xml @@ -34,4 +34,13 @@ #888888 + + + #f22121 + + + #ff4e4e + + + #00000000 diff --git a/InCallUI/src/com/android/incallui/CallCardFragment.java b/InCallUI/src/com/android/incallui/CallCardFragment.java index 9c772cb05..3bf23707d 100644 --- a/InCallUI/src/com/android/incallui/CallCardFragment.java +++ b/InCallUI/src/com/android/incallui/CallCardFragment.java @@ -312,7 +312,7 @@ public class CallCardFragment extends BaseFragment