Addes xxhdpi assets for InCallUi

- Changes how End Call button looks.

Bug: 10491107
Change-Id: I02271ba346a8879b4642f4a642513211d2a328fc

77 files changed, 17 insertions, 26 deletions

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
--- a/InCallUI/res/drawable-hdpi/endcall_active.png
+++ /dev/null
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
--- a/InCallUI/res/drawable-hdpi/endcall_background_texture.png
+++ /dev/null
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
--- a/InCallUI/res/drawable-hdpi/endcall_disable.png
+++ /dev/null
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
--- /dev/null
+++ b/InCallUI/res/drawable-hdpi/ic_in_call_bt_dk.png
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
--- a/InCallUI/res/drawable-hdpi/ic_incoming_call_bluetooth.png
+++ /dev/null
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
--- a/InCallUI/res/drawable-hdpi/list_pressed_holo_dark.9.png
+++ b/InCallUI/res/drawable-hdpi/list_pressed_holo_dark.9.png
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
--- a/InCallUI/res/drawable-hdpi/list_selector_disabled_holo_dark.9.png
+++ b/InCallUI/res/drawable-hdpi/list_selector_disabled_holo_dark.9.png
diff --git a/InCallUI/res/drawable-hdpi/picture_unknown.png b/InCallUI/res/drawable-hdpi/picture_unknown.png
index 278c1215c..ba46da151 100644
--- a/InCallUI/res/drawable-hdpi/picture_unknown.png
+++ b/InCallUI/res/drawable-hdpi/picture_unknown.png
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
--- a/InCallUI/res/drawable-mdpi/endcall_active.png
+++ /dev/null
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
--- a/InCallUI/res/drawable-mdpi/endcall_background_texture.png
+++ /dev/null
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
--- a/InCallUI/res/drawable-mdpi/endcall_disable.png
+++ /dev/null
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
--- /dev/null
+++ b/InCallUI/res/drawable-mdpi/ic_in_call_bt_dk.png
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
--- a/InCallUI/res/drawable-mdpi/ic_incoming_call_bluetooth.png
+++ /dev/null
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
--- a/InCallUI/res/drawable-mdpi/list_pressed_holo_dark.9.png
+++ b/InCallUI/res/drawable-mdpi/list_pressed_holo_dark.9.png
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
--- a/InCallUI/res/drawable-mdpi/list_selector_disabled_holo_dark.9.png
+++ b/InCallUI/res/drawable-mdpi/list_selector_disabled_holo_dark.9.png
diff --git a/InCallUI/res/drawable-mdpi/picture_unknown.png b/InCallUI/res/drawable-mdpi/picture_unknown.png
index cc5dd09a6..995df75b3 100644
--- a/InCallUI/res/drawable-mdpi/picture_unknown.png
+++ b/InCallUI/res/drawable-mdpi/picture_unknown.png
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
--- a/InCallUI/res/drawable-xhdpi/endcall_active.png
+++ /dev/null
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
--- a/InCallUI/res/drawable-xhdpi/endcall_background_texture.png
+++ /dev/null
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
--- a/InCallUI/res/drawable-xhdpi/endcall_disable.png
+++ /dev/null
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
--- /dev/null
+++ b/InCallUI/res/drawable-xhdpi/ic_in_call_bt_dk.png
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
--- a/InCallUI/res/drawable-xhdpi/ic_incoming_call_bluetooth.png
+++ /dev/null
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
--- a/InCallUI/res/drawable-xhdpi/list_pressed_holo_dark.9.png
+++ b/InCallUI/res/drawable-xhdpi/list_pressed_holo_dark.9.png
diff --git a/InCallUI/res/drawable-xhdpi/picture_unknown.png b/InCallUI/res/drawable-xhdpi/picture_unknown.png
index b8ee922fd..b4bd3666a 100644
--- a/InCallUI/res/drawable-xhdpi/picture_unknown.png
+++ b/InCallUI/res/drawable-xhdpi/picture_unknown.png
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
--- /dev/null
+++ b/InCallUI/res/drawable-xxhdpi/dial_background_texture.png
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
--- /dev/null
+++ b/InCallUI/res/drawable-xxhdpi/dial_num_0_no_plus_wht.png
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
--- /dev/null
+++ b/InCallUI/res/drawable-xxhdpi/dial_num_0_wht.png
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
--- /dev/null
+++ b/InCallUI/res/drawable-xxhdpi/dial_num_1_no_vm_wht.png
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
--- /dev/null
+++ b/InCallUI/res/drawable-xxhdpi/dial_num_1_wht.png
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
--- /dev/null
+++ b/InCallUI/res/drawable-xxhdpi/dial_num_2_wht.png
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
--- /dev/null
+++ b/InCallUI/res/drawable-xxhdpi/dial_num_3_wht.png
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
--- /dev/null
+++ b/InCallUI/res/drawable-xxhdpi/dial_num_4_wht.png
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
--- /dev/null
+++ b/InCallUI/res/drawable-xxhdpi/dial_num_5_wht.png
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
--- /dev/null
+++ b/InCallUI/res/drawable-xxhdpi/dial_num_6_wht.png
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
--- /dev/null
+++ b/InCallUI/res/drawable-xxhdpi/dial_num_7_wht.png
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
--- /dev/null
+++ b/InCallUI/res/drawable-xxhdpi/dial_num_8_wht.png
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
--- /dev/null
+++ b/InCallUI/res/drawable-xxhdpi/dial_num_9_wht.png
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
--- /dev/null
+++ b/InCallUI/res/drawable-xxhdpi/dial_num_pound_wht.png
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
--- /dev/null
+++ b/InCallUI/res/drawable-xxhdpi/dial_num_star_wht.png
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
--- /dev/null
+++ b/InCallUI/res/drawable-xxhdpi/ic_ab_dialer_holo_dark.png
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
--- /dev/null
+++ b/InCallUI/res/drawable-xxhdpi/ic_active_state_dialer_holo_dark.png
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
--- /dev/null
+++ b/InCallUI/res/drawable-xxhdpi/ic_add_contact_holo_dark.png
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
--- /dev/null
+++ b/InCallUI/res/drawable-xxhdpi/ic_bluetooth_holo_dark.png
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
--- /dev/null
+++ b/InCallUI/res/drawable-xxhdpi/ic_dial_end_call.png
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
--- /dev/null
+++ b/InCallUI/res/drawable-xxhdpi/ic_dialpad_holo_dark.png
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
--- /dev/null
+++ b/InCallUI/res/drawable-xxhdpi/ic_end_call_holo_dark.png
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
--- /dev/null
+++ b/InCallUI/res/drawable-xxhdpi/ic_groups_holo_dark.png
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
--- /dev/null
+++ b/InCallUI/res/drawable-xxhdpi/ic_hold_pause_holo_dark.png
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
--- /dev/null
+++ b/InCallUI/res/drawable-xxhdpi/ic_in_call_bt_dk.png
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
--- /dev/null
+++ b/InCallUI/res/drawable-xxhdpi/ic_in_call_touch_handle_normal.png
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
--- /dev/null
+++ b/InCallUI/res/drawable-xxhdpi/ic_incall_switch_holo_dark.png
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
--- /dev/null
+++ b/InCallUI/res/drawable-xxhdpi/ic_lockscreen_answer_activated.png
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
--- /dev/null
+++ b/InCallUI/res/drawable-xxhdpi/ic_lockscreen_answer_normal.png
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
--- /dev/null
+++ b/InCallUI/res/drawable-xxhdpi/ic_lockscreen_decline_activated.png
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
--- /dev/null
+++ b/InCallUI/res/drawable-xxhdpi/ic_lockscreen_decline_normal.png
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
--- /dev/null
+++ b/InCallUI/res/drawable-xxhdpi/ic_lockscreen_text_activated.png
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
--- /dev/null
+++ b/InCallUI/res/drawable-xxhdpi/ic_lockscreen_text_normal.png
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
--- /dev/null
+++ b/InCallUI/res/drawable-xxhdpi/ic_merge_holo_dark.png
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
--- /dev/null
+++ b/InCallUI/res/drawable-xxhdpi/ic_more_indicator_holo_dark.png
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
--- /dev/null
+++ b/InCallUI/res/drawable-xxhdpi/ic_mute_holo_dark.png
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
--- /dev/null
+++ b/InCallUI/res/drawable-xxhdpi/ic_sound_bluetooth_holo_dark.png
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
--- /dev/null
+++ b/InCallUI/res/drawable-xxhdpi/ic_sound_handset_holo_dark.png
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
--- /dev/null
+++ b/InCallUI/res/drawable-xxhdpi/ic_sound_holo_dark.png
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
--- /dev/null
+++ b/InCallUI/res/drawable-xxhdpi/ic_sound_off_speakerphone_holo_dark.png
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
--- /dev/null
+++ b/InCallUI/res/drawable-xxhdpi/ic_sound_speakerphone_holo_dark.png
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
--- /dev/null
+++ b/InCallUI/res/drawable-xxhdpi/ic_split_holo_dark.png
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
--- /dev/null
+++ b/InCallUI/res/drawable-xxhdpi/list_focused_holo.9.png
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
--- /dev/null
+++ b/InCallUI/res/drawable-xxhdpi/list_pressed_holo_dark.9.png
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
--- /dev/null
+++ b/InCallUI/res/drawable-xxhdpi/list_selector_disabled_holo_dark.9.png
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
--- /dev/null
+++ b/InCallUI/res/drawable-xxhdpi/picture_conference.png
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
--- /dev/null
+++ b/InCallUI/res/drawable-xxhdpi/picture_unknown.png
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
--- /dev/null
+++ b/InCallUI/res/drawable-xxhdpi/stat_sys_phone_call.png
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
--- /dev/null
+++ b/InCallUI/res/drawable-xxhdpi/stat_sys_phone_call_end.png
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
--- /dev/null
+++ b/InCallUI/res/drawable-xxhdpi/stat_sys_phone_call_on_hold.png
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 @@
 <!-- Background drawable used to render the "end call" button. -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:state_enabled="false">
-        <bitmap
-            android:src="@drawable/endcall_disable"
-            android:tileMode="repeat" />
-    </item>
-
-    <item android:state_pressed="true">
-        <bitmap
-            android:src="@drawable/endcall_active"
-            android:tileMode="repeat" />
-    </item>
-
-    <item>
-        <layer-list>
-            <item>
-                <bitmap
-                    android:src="@drawable/endcall_background_texture"
-                    android:tileMode="repeat" />
-            </item>
-
-            <!-- The standard "compound button" background. -->
-            <item android:drawable="@drawable/btn_compound_background" />
-        </layer-list>
-    </item>
+    <item android:state_enabled="false"
+          android:drawable="@drawable/end_call_disabled_state" />
+
+    <item android:state_pressed="true"
+          android:drawable="@drawable/end_call_pressed_state" />
+
+    <item android:drawable="@drawable/end_call_active_state" />
 
 </selector>
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 @@
 
     <!-- Used with some smaller texts in manage conference screen. -->
     <color name="manage_conference_secondary_text_color">#888888</color>
+
+    <!-- Used when the End Call button is active -->
+    <drawable name="end_call_active_state">#f22121</drawable>
+
+    <!-- Used when the End Call button is pressed -->
+    <drawable name="end_call_pressed_state">#ff4e4e</drawable>
+
+    <!-- Used when the End Call button is disabled -->
+    <drawable name="end_call_disabled_state">#00000000</drawable>
 </resources>
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<CallCardPresenter, CallCardPr
         // Also, display a special icon (alongside the "Incoming call"
         // label) if there's an incoming call and audio will be routed
         // to bluetooth when you answer it.
-        final int bluetoothIconId = R.drawable.ic_incoming_call_bluetooth;
+        final int bluetoothIconId = R.drawable.ic_in_call_bt_dk;
 
         if (onOff) {
             mCallStateLabel.setCompoundDrawablesWithIntrinsicBounds(bluetoothIconId, 0, 0, 0);