diff --git a/res/anim/activity_close_enter.xml b/res/anim/activity_close_enter.xml
deleted file mode 100644
index a526fe1..0000000
--- a/res/anim/activity_close_enter.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 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.
-*/
--->
-
-<set xmlns:android="http://schemas.android.com/apk/res/android" android:zAdjustment="normal">
-    <alpha android:fromAlpha="1.0" android:toAlpha="1.0"
-            android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
-            android:duration="300"/>
-</set>
diff --git a/res/anim/activity_close_exit.xml b/res/anim/activity_close_exit.xml
deleted file mode 100644
index b879bdb..0000000
--- a/res/anim/activity_close_exit.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 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.
-*/
--->
-
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-        android:shareInterpolator="false" android:zAdjustment="top">
-    <alpha android:fromAlpha="1.0" android:toAlpha="0.0"
-            android:interpolator="@*android:interpolator/decelerate_cubic"
-            android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
-            android:duration="300"/>
-    <scale android:fromXScale="1.0" android:toXScale=".8"
-            android:fromYScale="1.0" android:toYScale=".8"
-            android:pivotX="50%p" android:pivotY="50%p"
-            android:interpolator="@*android:interpolator/decelerate_cubic"
-            android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
-            android:duration="300"/>
-</set>
diff --git a/res/drawable-hdpi/endcall_active.png b/res/drawable-hdpi/endcall_active.png
deleted file mode 100644
index 38f1e1c..0000000
--- a/res/drawable-hdpi/endcall_active.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/endcall_background_texture.png b/res/drawable-hdpi/endcall_background_texture.png
deleted file mode 100644
index 095b0b6..0000000
--- a/res/drawable-hdpi/endcall_background_texture.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/endcall_disable.png b/res/drawable-hdpi/endcall_disable.png
deleted file mode 100644
index 6a0f658..0000000
--- a/res/drawable-hdpi/endcall_disable.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_ab_dialer_holo_dark.png b/res/drawable-hdpi/ic_ab_dialer_holo_dark.png
deleted file mode 100644
index ecfeb2d..0000000
--- a/res/drawable-hdpi/ic_ab_dialer_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_add_contact_holo_dark.png b/res/drawable-hdpi/ic_add_contact_holo_dark.png
deleted file mode 100644
index 88ff33b..0000000
--- a/res/drawable-hdpi/ic_add_contact_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_bluetooth_holo_dark.png b/res/drawable-hdpi/ic_bluetooth_holo_dark.png
deleted file mode 100644
index ba22b0f..0000000
--- a/res/drawable-hdpi/ic_bluetooth_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_dial_end_call.png b/res/drawable-hdpi/ic_dial_end_call.png
deleted file mode 100644
index ab3adb4..0000000
--- a/res/drawable-hdpi/ic_dial_end_call.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_dialpad_holo_dark.png b/res/drawable-hdpi/ic_dialpad_holo_dark.png
deleted file mode 100644
index a0ab6c4..0000000
--- a/res/drawable-hdpi/ic_dialpad_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_end_call_holo_dark.png b/res/drawable-hdpi/ic_end_call_holo_dark.png
deleted file mode 100644
index 0f373bb..0000000
--- a/res/drawable-hdpi/ic_end_call_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_groups_holo_dark.png b/res/drawable-hdpi/ic_groups_holo_dark.png
deleted file mode 100644
index 6194506..0000000
--- a/res/drawable-hdpi/ic_groups_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_hold_pause_holo_dark.png b/res/drawable-hdpi/ic_hold_pause_holo_dark.png
deleted file mode 100644
index 2b3ff3d..0000000
--- a/res/drawable-hdpi/ic_hold_pause_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_in_call_touch_handle_normal.png b/res/drawable-hdpi/ic_in_call_touch_handle_normal.png
deleted file mode 100644
index e8525348..0000000
--- a/res/drawable-hdpi/ic_in_call_touch_handle_normal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_incall_switch_holo_dark.png b/res/drawable-hdpi/ic_incall_switch_holo_dark.png
deleted file mode 100644
index 429511b..0000000
--- a/res/drawable-hdpi/ic_incall_switch_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_incoming_call_bluetooth.png b/res/drawable-hdpi/ic_incoming_call_bluetooth.png
deleted file mode 100644
index 050c3e7..0000000
--- a/res/drawable-hdpi/ic_incoming_call_bluetooth.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_lockscreen_answer_activated.png b/res/drawable-hdpi/ic_lockscreen_answer_activated.png
deleted file mode 100644
index 3d2752f..0000000
--- a/res/drawable-hdpi/ic_lockscreen_answer_activated.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_lockscreen_answer_normal.png b/res/drawable-hdpi/ic_lockscreen_answer_normal.png
deleted file mode 100644
index 9e26eda..0000000
--- a/res/drawable-hdpi/ic_lockscreen_answer_normal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_lockscreen_decline_activated.png b/res/drawable-hdpi/ic_lockscreen_decline_activated.png
deleted file mode 100644
index b7a438f..0000000
--- a/res/drawable-hdpi/ic_lockscreen_decline_activated.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_lockscreen_decline_normal.png b/res/drawable-hdpi/ic_lockscreen_decline_normal.png
deleted file mode 100644
index a687ae3..0000000
--- a/res/drawable-hdpi/ic_lockscreen_decline_normal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_lockscreen_text_activated.png b/res/drawable-hdpi/ic_lockscreen_text_activated.png
deleted file mode 100644
index 22cf07c..0000000
--- a/res/drawable-hdpi/ic_lockscreen_text_activated.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_lockscreen_text_normal.png b/res/drawable-hdpi/ic_lockscreen_text_normal.png
deleted file mode 100644
index db6c05d..0000000
--- a/res/drawable-hdpi/ic_lockscreen_text_normal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_merge_holo_dark.png b/res/drawable-hdpi/ic_merge_holo_dark.png
deleted file mode 100644
index 5069cbe..0000000
--- a/res/drawable-hdpi/ic_merge_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_more_indicator_holo_dark.png b/res/drawable-hdpi/ic_more_indicator_holo_dark.png
deleted file mode 100644
index 554f7e9..0000000
--- a/res/drawable-hdpi/ic_more_indicator_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_mute_holo_dark.png b/res/drawable-hdpi/ic_mute_holo_dark.png
deleted file mode 100644
index f17a2da..0000000
--- a/res/drawable-hdpi/ic_mute_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_sound_bluetooth_holo_dark.png b/res/drawable-hdpi/ic_sound_bluetooth_holo_dark.png
deleted file mode 100644
index c7f2402..0000000
--- a/res/drawable-hdpi/ic_sound_bluetooth_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_sound_handset_holo_dark.png b/res/drawable-hdpi/ic_sound_handset_holo_dark.png
deleted file mode 100644
index 288141a..0000000
--- a/res/drawable-hdpi/ic_sound_handset_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_sound_holo_dark.png b/res/drawable-hdpi/ic_sound_holo_dark.png
deleted file mode 100644
index 08ee3e8..0000000
--- a/res/drawable-hdpi/ic_sound_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_sound_off_speakerphone_holo_dark.png b/res/drawable-hdpi/ic_sound_off_speakerphone_holo_dark.png
deleted file mode 100644
index 6f12d52..0000000
--- a/res/drawable-hdpi/ic_sound_off_speakerphone_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_sound_speakerphone_holo_dark.png b/res/drawable-hdpi/ic_sound_speakerphone_holo_dark.png
deleted file mode 100644
index eadd0cd..0000000
--- a/res/drawable-hdpi/ic_sound_speakerphone_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_split_holo_dark.png b/res/drawable-hdpi/ic_split_holo_dark.png
deleted file mode 100644
index 5b10cf9..0000000
--- a/res/drawable-hdpi/ic_split_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_videocall_holo_dark.png b/res/drawable-hdpi/ic_videocall_holo_dark.png
deleted file mode 100644
index 7aa3222..0000000
--- a/res/drawable-hdpi/ic_videocall_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/picture_busy.png b/res/drawable-hdpi/picture_busy.png
deleted file mode 100644
index 98deacf..0000000
--- a/res/drawable-hdpi/picture_busy.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/picture_conference.png b/res/drawable-hdpi/picture_conference.png
deleted file mode 100644
index 93743e6..0000000
--- a/res/drawable-hdpi/picture_conference.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/picture_dialing.png b/res/drawable-hdpi/picture_dialing.png
deleted file mode 100644
index 6311f69..0000000
--- a/res/drawable-hdpi/picture_dialing.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/picture_unknown.png b/res/drawable-hdpi/picture_unknown.png
deleted file mode 100644
index 278c121..0000000
--- a/res/drawable-hdpi/picture_unknown.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/ic_ab_dialer_holo_dark.png b/res/drawable-ldrtl-hdpi/ic_ab_dialer_holo_dark.png
deleted file mode 100644
index 7ec3709..0000000
--- a/res/drawable-ldrtl-hdpi/ic_ab_dialer_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/ic_add_contact_holo_dark.png b/res/drawable-ldrtl-hdpi/ic_add_contact_holo_dark.png
deleted file mode 100644
index b6a1381..0000000
--- a/res/drawable-ldrtl-hdpi/ic_add_contact_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/ic_groups_holo_dark.png b/res/drawable-ldrtl-hdpi/ic_groups_holo_dark.png
deleted file mode 100644
index 185c55b..0000000
--- a/res/drawable-ldrtl-hdpi/ic_groups_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/ic_in_call_touch_handle_normal.png b/res/drawable-ldrtl-hdpi/ic_in_call_touch_handle_normal.png
deleted file mode 100644
index 4a3628b..0000000
--- a/res/drawable-ldrtl-hdpi/ic_in_call_touch_handle_normal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/ic_lockscreen_answer_activated.png b/res/drawable-ldrtl-hdpi/ic_lockscreen_answer_activated.png
deleted file mode 100644
index f1deb75..0000000
--- a/res/drawable-ldrtl-hdpi/ic_lockscreen_answer_activated.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/ic_lockscreen_answer_normal.png b/res/drawable-ldrtl-hdpi/ic_lockscreen_answer_normal.png
deleted file mode 100644
index 3c23fe9..0000000
--- a/res/drawable-ldrtl-hdpi/ic_lockscreen_answer_normal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/ic_lockscreen_text_activated.png b/res/drawable-ldrtl-hdpi/ic_lockscreen_text_activated.png
deleted file mode 100644
index 63afb5e..0000000
--- a/res/drawable-ldrtl-hdpi/ic_lockscreen_text_activated.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/ic_lockscreen_text_normal.png b/res/drawable-ldrtl-hdpi/ic_lockscreen_text_normal.png
deleted file mode 100644
index 7443030..0000000
--- a/res/drawable-ldrtl-hdpi/ic_lockscreen_text_normal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/ic_more_indicator_holo_dark.png b/res/drawable-ldrtl-hdpi/ic_more_indicator_holo_dark.png
deleted file mode 100644
index adb18ae..0000000
--- a/res/drawable-ldrtl-hdpi/ic_more_indicator_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/ic_sound_handset_holo_dark.png b/res/drawable-ldrtl-hdpi/ic_sound_handset_holo_dark.png
deleted file mode 100644
index 207d941..0000000
--- a/res/drawable-ldrtl-hdpi/ic_sound_handset_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/ic_sound_holo_dark.png b/res/drawable-ldrtl-hdpi/ic_sound_holo_dark.png
deleted file mode 100644
index c2e8adb..0000000
--- a/res/drawable-ldrtl-hdpi/ic_sound_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/ic_sound_off_speakerphone_holo_dark.png b/res/drawable-ldrtl-hdpi/ic_sound_off_speakerphone_holo_dark.png
deleted file mode 100644
index 2f2b674..0000000
--- a/res/drawable-ldrtl-hdpi/ic_sound_off_speakerphone_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/ic_sound_speakerphone_holo_dark.png b/res/drawable-ldrtl-hdpi/ic_sound_speakerphone_holo_dark.png
deleted file mode 100644
index 135c7f3..0000000
--- a/res/drawable-ldrtl-hdpi/ic_sound_speakerphone_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/picture_conference.png b/res/drawable-ldrtl-hdpi/picture_conference.png
deleted file mode 100644
index ca250fd..0000000
--- a/res/drawable-ldrtl-hdpi/picture_conference.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/picture_dialing.png b/res/drawable-ldrtl-hdpi/picture_dialing.png
deleted file mode 100644
index cb587a8..0000000
--- a/res/drawable-ldrtl-hdpi/picture_dialing.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/picture_unknown.png b/res/drawable-ldrtl-hdpi/picture_unknown.png
deleted file mode 100644
index 3b81ff3..0000000
--- a/res/drawable-ldrtl-hdpi/picture_unknown.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/ic_ab_dialer_holo_dark.png b/res/drawable-ldrtl-mdpi/ic_ab_dialer_holo_dark.png
deleted file mode 100644
index 6020b3d..0000000
--- a/res/drawable-ldrtl-mdpi/ic_ab_dialer_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/ic_add_contact_holo_dark.png b/res/drawable-ldrtl-mdpi/ic_add_contact_holo_dark.png
deleted file mode 100644
index 72abb91..0000000
--- a/res/drawable-ldrtl-mdpi/ic_add_contact_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/ic_groups_holo_dark.png b/res/drawable-ldrtl-mdpi/ic_groups_holo_dark.png
deleted file mode 100644
index 844bed3..0000000
--- a/res/drawable-ldrtl-mdpi/ic_groups_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/ic_in_call_touch_handle_normal.png b/res/drawable-ldrtl-mdpi/ic_in_call_touch_handle_normal.png
deleted file mode 100644
index 13b2ecf..0000000
--- a/res/drawable-ldrtl-mdpi/ic_in_call_touch_handle_normal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/ic_lockscreen_answer_activated.png b/res/drawable-ldrtl-mdpi/ic_lockscreen_answer_activated.png
deleted file mode 100644
index 3d68ff9..0000000
--- a/res/drawable-ldrtl-mdpi/ic_lockscreen_answer_activated.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/ic_lockscreen_answer_normal.png b/res/drawable-ldrtl-mdpi/ic_lockscreen_answer_normal.png
deleted file mode 100644
index 2a223ea..0000000
--- a/res/drawable-ldrtl-mdpi/ic_lockscreen_answer_normal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/ic_lockscreen_text_activated.png b/res/drawable-ldrtl-mdpi/ic_lockscreen_text_activated.png
deleted file mode 100644
index 8e9c3b6..0000000
--- a/res/drawable-ldrtl-mdpi/ic_lockscreen_text_activated.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/ic_lockscreen_text_normal.png b/res/drawable-ldrtl-mdpi/ic_lockscreen_text_normal.png
deleted file mode 100644
index 8d4cb28..0000000
--- a/res/drawable-ldrtl-mdpi/ic_lockscreen_text_normal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/ic_more_indicator_holo_dark.png b/res/drawable-ldrtl-mdpi/ic_more_indicator_holo_dark.png
deleted file mode 100644
index 2de388f..0000000
--- a/res/drawable-ldrtl-mdpi/ic_more_indicator_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/ic_sound_handset_holo_dark.png b/res/drawable-ldrtl-mdpi/ic_sound_handset_holo_dark.png
deleted file mode 100644
index 6bf0e8d..0000000
--- a/res/drawable-ldrtl-mdpi/ic_sound_handset_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/ic_sound_holo_dark.png b/res/drawable-ldrtl-mdpi/ic_sound_holo_dark.png
deleted file mode 100644
index 561e8fa..0000000
--- a/res/drawable-ldrtl-mdpi/ic_sound_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/ic_sound_off_speakerphone_holo_dark.png b/res/drawable-ldrtl-mdpi/ic_sound_off_speakerphone_holo_dark.png
deleted file mode 100644
index 3f330ac..0000000
--- a/res/drawable-ldrtl-mdpi/ic_sound_off_speakerphone_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/ic_sound_speakerphone_holo_dark.png b/res/drawable-ldrtl-mdpi/ic_sound_speakerphone_holo_dark.png
deleted file mode 100644
index 6cf2e3c..0000000
--- a/res/drawable-ldrtl-mdpi/ic_sound_speakerphone_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/picture_conference.png b/res/drawable-ldrtl-mdpi/picture_conference.png
deleted file mode 100644
index 2876d0f..0000000
--- a/res/drawable-ldrtl-mdpi/picture_conference.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/picture_dialing.png b/res/drawable-ldrtl-mdpi/picture_dialing.png
deleted file mode 100644
index 4047b22..0000000
--- a/res/drawable-ldrtl-mdpi/picture_dialing.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/picture_unknown.png b/res/drawable-ldrtl-mdpi/picture_unknown.png
deleted file mode 100644
index 062faf5..0000000
--- a/res/drawable-ldrtl-mdpi/picture_unknown.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/ic_ab_dialer_holo_dark.png b/res/drawable-ldrtl-xhdpi/ic_ab_dialer_holo_dark.png
deleted file mode 100644
index c42e7e3..0000000
--- a/res/drawable-ldrtl-xhdpi/ic_ab_dialer_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/ic_add_contact_holo_dark.png b/res/drawable-ldrtl-xhdpi/ic_add_contact_holo_dark.png
deleted file mode 100644
index 60068fd..0000000
--- a/res/drawable-ldrtl-xhdpi/ic_add_contact_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/ic_groups_holo_dark.png b/res/drawable-ldrtl-xhdpi/ic_groups_holo_dark.png
deleted file mode 100644
index 38ea395..0000000
--- a/res/drawable-ldrtl-xhdpi/ic_groups_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/ic_in_call_touch_handle_normal.png b/res/drawable-ldrtl-xhdpi/ic_in_call_touch_handle_normal.png
deleted file mode 100644
index c707950..0000000
--- a/res/drawable-ldrtl-xhdpi/ic_in_call_touch_handle_normal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/ic_lockscreen_answer_activated.png b/res/drawable-ldrtl-xhdpi/ic_lockscreen_answer_activated.png
deleted file mode 100644
index 1acdc59..0000000
--- a/res/drawable-ldrtl-xhdpi/ic_lockscreen_answer_activated.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/ic_lockscreen_answer_normal.png b/res/drawable-ldrtl-xhdpi/ic_lockscreen_answer_normal.png
deleted file mode 100644
index 72c2afa..0000000
--- a/res/drawable-ldrtl-xhdpi/ic_lockscreen_answer_normal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/ic_lockscreen_text_activated.png b/res/drawable-ldrtl-xhdpi/ic_lockscreen_text_activated.png
deleted file mode 100644
index d292a7f..0000000
--- a/res/drawable-ldrtl-xhdpi/ic_lockscreen_text_activated.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/ic_lockscreen_text_normal.png b/res/drawable-ldrtl-xhdpi/ic_lockscreen_text_normal.png
deleted file mode 100644
index 8318590..0000000
--- a/res/drawable-ldrtl-xhdpi/ic_lockscreen_text_normal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/ic_more_indicator_holo_dark.png b/res/drawable-ldrtl-xhdpi/ic_more_indicator_holo_dark.png
deleted file mode 100644
index 6fe45cd..0000000
--- a/res/drawable-ldrtl-xhdpi/ic_more_indicator_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/ic_sound_handset_holo_dark.png b/res/drawable-ldrtl-xhdpi/ic_sound_handset_holo_dark.png
deleted file mode 100644
index 1c1f1ad..0000000
--- a/res/drawable-ldrtl-xhdpi/ic_sound_handset_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/ic_sound_holo_dark.png b/res/drawable-ldrtl-xhdpi/ic_sound_holo_dark.png
deleted file mode 100644
index ac38205..0000000
--- a/res/drawable-ldrtl-xhdpi/ic_sound_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/ic_sound_off_speakerphone_holo_dark.png b/res/drawable-ldrtl-xhdpi/ic_sound_off_speakerphone_holo_dark.png
deleted file mode 100644
index 5bc066a..0000000
--- a/res/drawable-ldrtl-xhdpi/ic_sound_off_speakerphone_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/ic_sound_speakerphone_holo_dark.png b/res/drawable-ldrtl-xhdpi/ic_sound_speakerphone_holo_dark.png
deleted file mode 100644
index 3999712..0000000
--- a/res/drawable-ldrtl-xhdpi/ic_sound_speakerphone_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/picture_conference.png b/res/drawable-ldrtl-xhdpi/picture_conference.png
deleted file mode 100644
index 50b4e35..0000000
--- a/res/drawable-ldrtl-xhdpi/picture_conference.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/picture_dialing.png b/res/drawable-ldrtl-xhdpi/picture_dialing.png
deleted file mode 100644
index f167ecb..0000000
--- a/res/drawable-ldrtl-xhdpi/picture_dialing.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/picture_unknown.png b/res/drawable-ldrtl-xhdpi/picture_unknown.png
deleted file mode 100644
index 1f57aa1..0000000
--- a/res/drawable-ldrtl-xhdpi/picture_unknown.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/endcall_active.png b/res/drawable-mdpi/endcall_active.png
deleted file mode 100644
index a82738b..0000000
--- a/res/drawable-mdpi/endcall_active.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/endcall_background_texture.png b/res/drawable-mdpi/endcall_background_texture.png
deleted file mode 100644
index efa6502..0000000
--- a/res/drawable-mdpi/endcall_background_texture.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/endcall_disable.png b/res/drawable-mdpi/endcall_disable.png
deleted file mode 100644
index bd1a2f3..0000000
--- a/res/drawable-mdpi/endcall_disable.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_ab_dialer_holo_dark.png b/res/drawable-mdpi/ic_ab_dialer_holo_dark.png
deleted file mode 100644
index 51ad9e3..0000000
--- a/res/drawable-mdpi/ic_ab_dialer_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_add_contact_holo_dark.png b/res/drawable-mdpi/ic_add_contact_holo_dark.png
deleted file mode 100644
index 867f494..0000000
--- a/res/drawable-mdpi/ic_add_contact_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_bluetooth_holo_dark.png b/res/drawable-mdpi/ic_bluetooth_holo_dark.png
deleted file mode 100644
index fb69031..0000000
--- a/res/drawable-mdpi/ic_bluetooth_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_dial_end_call.png b/res/drawable-mdpi/ic_dial_end_call.png
deleted file mode 100644
index c476642..0000000
--- a/res/drawable-mdpi/ic_dial_end_call.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_dialpad_holo_dark.png b/res/drawable-mdpi/ic_dialpad_holo_dark.png
deleted file mode 100644
index b57fcf3..0000000
--- a/res/drawable-mdpi/ic_dialpad_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_end_call_holo_dark.png b/res/drawable-mdpi/ic_end_call_holo_dark.png
deleted file mode 100644
index e090cc8..0000000
--- a/res/drawable-mdpi/ic_end_call_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_groups_holo_dark.png b/res/drawable-mdpi/ic_groups_holo_dark.png
deleted file mode 100644
index fefee32..0000000
--- a/res/drawable-mdpi/ic_groups_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_hold_pause_holo_dark.png b/res/drawable-mdpi/ic_hold_pause_holo_dark.png
deleted file mode 100644
index 7d550de..0000000
--- a/res/drawable-mdpi/ic_hold_pause_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_in_call_touch_handle_normal.png b/res/drawable-mdpi/ic_in_call_touch_handle_normal.png
deleted file mode 100644
index cebdc4d..0000000
--- a/res/drawable-mdpi/ic_in_call_touch_handle_normal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_incall_switch_holo_dark.png b/res/drawable-mdpi/ic_incall_switch_holo_dark.png
deleted file mode 100644
index 5b35ef1..0000000
--- a/res/drawable-mdpi/ic_incall_switch_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_incoming_call_bluetooth.png b/res/drawable-mdpi/ic_incoming_call_bluetooth.png
deleted file mode 100644
index 4b317c1..0000000
--- a/res/drawable-mdpi/ic_incoming_call_bluetooth.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_lockscreen_answer_activated.png b/res/drawable-mdpi/ic_lockscreen_answer_activated.png
deleted file mode 100644
index 6a78f81..0000000
--- a/res/drawable-mdpi/ic_lockscreen_answer_activated.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_lockscreen_answer_normal.png b/res/drawable-mdpi/ic_lockscreen_answer_normal.png
deleted file mode 100644
index da15c33..0000000
--- a/res/drawable-mdpi/ic_lockscreen_answer_normal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_lockscreen_decline_activated.png b/res/drawable-mdpi/ic_lockscreen_decline_activated.png
deleted file mode 100644
index 6496626..0000000
--- a/res/drawable-mdpi/ic_lockscreen_decline_activated.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_lockscreen_decline_normal.png b/res/drawable-mdpi/ic_lockscreen_decline_normal.png
deleted file mode 100644
index 27fe093..0000000
--- a/res/drawable-mdpi/ic_lockscreen_decline_normal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_lockscreen_text_activated.png b/res/drawable-mdpi/ic_lockscreen_text_activated.png
deleted file mode 100644
index e3e4fc1..0000000
--- a/res/drawable-mdpi/ic_lockscreen_text_activated.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_lockscreen_text_normal.png b/res/drawable-mdpi/ic_lockscreen_text_normal.png
deleted file mode 100644
index 4a2a54b..0000000
--- a/res/drawable-mdpi/ic_lockscreen_text_normal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_merge_holo_dark.png b/res/drawable-mdpi/ic_merge_holo_dark.png
deleted file mode 100644
index bd34def..0000000
--- a/res/drawable-mdpi/ic_merge_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_more_indicator_holo_dark.png b/res/drawable-mdpi/ic_more_indicator_holo_dark.png
deleted file mode 100644
index 27b6d33..0000000
--- a/res/drawable-mdpi/ic_more_indicator_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_mute_holo_dark.png b/res/drawable-mdpi/ic_mute_holo_dark.png
deleted file mode 100644
index 801d1e0..0000000
--- a/res/drawable-mdpi/ic_mute_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_sound_bluetooth_holo_dark.png b/res/drawable-mdpi/ic_sound_bluetooth_holo_dark.png
deleted file mode 100644
index c0e95cb..0000000
--- a/res/drawable-mdpi/ic_sound_bluetooth_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_sound_handset_holo_dark.png b/res/drawable-mdpi/ic_sound_handset_holo_dark.png
deleted file mode 100644
index e5fce57..0000000
--- a/res/drawable-mdpi/ic_sound_handset_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_sound_holo_dark.png b/res/drawable-mdpi/ic_sound_holo_dark.png
deleted file mode 100644
index 060f926..0000000
--- a/res/drawable-mdpi/ic_sound_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_sound_off_speakerphone_holo_dark.png b/res/drawable-mdpi/ic_sound_off_speakerphone_holo_dark.png
deleted file mode 100644
index adaff60..0000000
--- a/res/drawable-mdpi/ic_sound_off_speakerphone_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_sound_speakerphone_holo_dark.png b/res/drawable-mdpi/ic_sound_speakerphone_holo_dark.png
deleted file mode 100644
index 2b9600b..0000000
--- a/res/drawable-mdpi/ic_sound_speakerphone_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_split_holo_dark.png b/res/drawable-mdpi/ic_split_holo_dark.png
deleted file mode 100644
index 3980acb..0000000
--- a/res/drawable-mdpi/ic_split_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_videocall_holo_dark.png b/res/drawable-mdpi/ic_videocall_holo_dark.png
deleted file mode 100644
index 776d27a..0000000
--- a/res/drawable-mdpi/ic_videocall_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/picture_busy.png b/res/drawable-mdpi/picture_busy.png
deleted file mode 100644
index ca1c6bf..0000000
--- a/res/drawable-mdpi/picture_busy.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/picture_conference.png b/res/drawable-mdpi/picture_conference.png
deleted file mode 100644
index 8f7ecd5..0000000
--- a/res/drawable-mdpi/picture_conference.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/picture_dialing.png b/res/drawable-mdpi/picture_dialing.png
deleted file mode 100644
index b81b603..0000000
--- a/res/drawable-mdpi/picture_dialing.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/picture_unknown.png b/res/drawable-mdpi/picture_unknown.png
deleted file mode 100644
index cc5dd09..0000000
--- a/res/drawable-mdpi/picture_unknown.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/endcall_active.png b/res/drawable-xhdpi/endcall_active.png
deleted file mode 100644
index 5347ed2..0000000
--- a/res/drawable-xhdpi/endcall_active.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/endcall_background_texture.png b/res/drawable-xhdpi/endcall_background_texture.png
deleted file mode 100644
index c94eeec..0000000
--- a/res/drawable-xhdpi/endcall_background_texture.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/endcall_disable.png b/res/drawable-xhdpi/endcall_disable.png
deleted file mode 100644
index fa10196..0000000
--- a/res/drawable-xhdpi/endcall_disable.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_ab_dialer_holo_dark.png b/res/drawable-xhdpi/ic_ab_dialer_holo_dark.png
deleted file mode 100644
index 3f43a82..0000000
--- a/res/drawable-xhdpi/ic_ab_dialer_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_add_contact_holo_dark.png b/res/drawable-xhdpi/ic_add_contact_holo_dark.png
deleted file mode 100644
index 7298882..0000000
--- a/res/drawable-xhdpi/ic_add_contact_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_bluetooth_holo_dark.png b/res/drawable-xhdpi/ic_bluetooth_holo_dark.png
deleted file mode 100644
index 24cb893..0000000
--- a/res/drawable-xhdpi/ic_bluetooth_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_dial_end_call.png b/res/drawable-xhdpi/ic_dial_end_call.png
deleted file mode 100644
index c24ec98..0000000
--- a/res/drawable-xhdpi/ic_dial_end_call.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_dialpad_holo_dark.png b/res/drawable-xhdpi/ic_dialpad_holo_dark.png
deleted file mode 100644
index f9a002c..0000000
--- a/res/drawable-xhdpi/ic_dialpad_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_end_call_holo_dark.png b/res/drawable-xhdpi/ic_end_call_holo_dark.png
deleted file mode 100644
index f64f5e3..0000000
--- a/res/drawable-xhdpi/ic_end_call_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_groups_holo_dark.png b/res/drawable-xhdpi/ic_groups_holo_dark.png
deleted file mode 100644
index 470ca27..0000000
--- a/res/drawable-xhdpi/ic_groups_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_hold_pause_holo_dark.png b/res/drawable-xhdpi/ic_hold_pause_holo_dark.png
deleted file mode 100644
index d296675..0000000
--- a/res/drawable-xhdpi/ic_hold_pause_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_in_call_touch_handle_normal.png b/res/drawable-xhdpi/ic_in_call_touch_handle_normal.png
deleted file mode 100644
index 1d112f2..0000000
--- a/res/drawable-xhdpi/ic_in_call_touch_handle_normal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_incall_switch_holo_dark.png b/res/drawable-xhdpi/ic_incall_switch_holo_dark.png
deleted file mode 100644
index 9168c32..0000000
--- a/res/drawable-xhdpi/ic_incall_switch_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_incoming_call_bluetooth.png b/res/drawable-xhdpi/ic_incoming_call_bluetooth.png
deleted file mode 100644
index 662e7bb..0000000
--- a/res/drawable-xhdpi/ic_incoming_call_bluetooth.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_lockscreen_answer_activated.png b/res/drawable-xhdpi/ic_lockscreen_answer_activated.png
deleted file mode 100644
index cd6a6ab..0000000
--- a/res/drawable-xhdpi/ic_lockscreen_answer_activated.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_lockscreen_answer_normal.png b/res/drawable-xhdpi/ic_lockscreen_answer_normal.png
deleted file mode 100644
index 983d5d9..0000000
--- a/res/drawable-xhdpi/ic_lockscreen_answer_normal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_lockscreen_decline_activated.png b/res/drawable-xhdpi/ic_lockscreen_decline_activated.png
deleted file mode 100644
index 317b329..0000000
--- a/res/drawable-xhdpi/ic_lockscreen_decline_activated.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_lockscreen_decline_normal.png b/res/drawable-xhdpi/ic_lockscreen_decline_normal.png
deleted file mode 100644
index 2cb03e7..0000000
--- a/res/drawable-xhdpi/ic_lockscreen_decline_normal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_lockscreen_text_activated.png b/res/drawable-xhdpi/ic_lockscreen_text_activated.png
deleted file mode 100644
index 41ea18a..0000000
--- a/res/drawable-xhdpi/ic_lockscreen_text_activated.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_lockscreen_text_normal.png b/res/drawable-xhdpi/ic_lockscreen_text_normal.png
deleted file mode 100644
index 15e4779..0000000
--- a/res/drawable-xhdpi/ic_lockscreen_text_normal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_merge_holo_dark.png b/res/drawable-xhdpi/ic_merge_holo_dark.png
deleted file mode 100644
index 57baa20..0000000
--- a/res/drawable-xhdpi/ic_merge_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_more_indicator_holo_dark.png b/res/drawable-xhdpi/ic_more_indicator_holo_dark.png
deleted file mode 100644
index 3d9897a..0000000
--- a/res/drawable-xhdpi/ic_more_indicator_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_mute_holo_dark.png b/res/drawable-xhdpi/ic_mute_holo_dark.png
deleted file mode 100644
index a882a76..0000000
--- a/res/drawable-xhdpi/ic_mute_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_sound_bluetooth_holo_dark.png b/res/drawable-xhdpi/ic_sound_bluetooth_holo_dark.png
deleted file mode 100644
index 867d87d..0000000
--- a/res/drawable-xhdpi/ic_sound_bluetooth_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_sound_handset_holo_dark.png b/res/drawable-xhdpi/ic_sound_handset_holo_dark.png
deleted file mode 100644
index 42e19bd..0000000
--- a/res/drawable-xhdpi/ic_sound_handset_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_sound_holo_dark.png b/res/drawable-xhdpi/ic_sound_holo_dark.png
deleted file mode 100644
index aa2a5af..0000000
--- a/res/drawable-xhdpi/ic_sound_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_sound_off_speakerphone_holo_dark.png b/res/drawable-xhdpi/ic_sound_off_speakerphone_holo_dark.png
deleted file mode 100644
index 98a449f..0000000
--- a/res/drawable-xhdpi/ic_sound_off_speakerphone_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_sound_speakerphone_holo_dark.png b/res/drawable-xhdpi/ic_sound_speakerphone_holo_dark.png
deleted file mode 100644
index 71aad97..0000000
--- a/res/drawable-xhdpi/ic_sound_speakerphone_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_split_holo_dark.png b/res/drawable-xhdpi/ic_split_holo_dark.png
deleted file mode 100644
index db558e4..0000000
--- a/res/drawable-xhdpi/ic_split_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_videocall_holo_dark.png b/res/drawable-xhdpi/ic_videocall_holo_dark.png
deleted file mode 100644
index 2b7dcab..0000000
--- a/res/drawable-xhdpi/ic_videocall_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/picture_busy.png b/res/drawable-xhdpi/picture_busy.png
deleted file mode 100644
index 0e4f13e..0000000
--- a/res/drawable-xhdpi/picture_busy.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/picture_conference.png b/res/drawable-xhdpi/picture_conference.png
deleted file mode 100644
index 1906b9b..0000000
--- a/res/drawable-xhdpi/picture_conference.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/picture_dialing.png b/res/drawable-xhdpi/picture_dialing.png
deleted file mode 100644
index 792cd8e..0000000
--- a/res/drawable-xhdpi/picture_dialing.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/picture_unknown.png b/res/drawable-xhdpi/picture_unknown.png
deleted file mode 100644
index b8ee922..0000000
--- a/res/drawable-xhdpi/picture_unknown.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/btn_compound_audio.xml b/res/drawable/btn_compound_audio.xml
deleted file mode 100644
index c348c98..0000000
--- a/res/drawable/btn_compound_audio.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 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.
--->
-
-<!-- Layers used to render the in-call "Audio mode" compound button.
-
-     This is a multi-mode button:
-
-     - If no bluetooth headset is connected, it behaves like a simple
-       "compound button" that switches the speaker on and off.  (This is why
-       the button itself is a ToggleButton instance.)
-
-     - But if a bluetooth headset is connected, this becomes a simple
-       action button (with no concept of a "checked" state) that brings
-       up a popup menu offering you a 3-way choice between earpiece /
-       speaker / bluetooth.
-
-     See InCallTouchUi.updateAudioButton() for the corresponding code. -->
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <!-- The standard "compound button" background, used to distinguish
-         between the "checked" and "unchecked" states when this button is
-         simply an on/off toggle for the speaker.
-         (In states where the audio button *not* a toggle, we explicitly
-         hide this layer.) -->
-    <item android:id="@+id/compoundBackgroundItem"
-          android:drawable="@drawable/btn_compound_background" />
-
-    <!-- The little triangle that indicates that this isn't a plain
-         button, but will instead pop up a menu.  This layer is *not*
-         shown when the audio button is simply an on/off toggle. -->
-    <!-- Use an explicit <bitmap> to avoid scaling the icon up to the full
-         size of the button. -->
-    <item android:id="@+id/moreIndicatorItem">
-        <bitmap android:src="@drawable/ic_more_indicator_holo_dark"
-                android:gravity="center" />
-    </item>
-
-    <!-- Finally, the button icon.
-
-         When the audio button is simply an on/off toggle for the speaker,
-         the icon is a "speakerphone" regardless of whether the speaker is
-         active.  (Instead, the "on/off" indication comes from the
-         btn_compound_background selector.)
-
-         But when the audio button is connected to the 3-way popup menu,
-         we use the button's icon to indicate the current audio mode
-         (i.e. one of { earpiece (or wired headset) , speaker , bluetooth }).
-
-         Here we have separate layers for each possible foreground icon,
-         and in InCallTouchUi.updateAudioButton() we hide them all
-         *except* the one needed for the current state. -->
-
-    <!-- These all use an explicit <bitmap> to avoid scaling the icon up
-         to the full size of the button. -->
-
-    <!-- Bluetooth is active -->
-    <item android:id="@+id/bluetoothItem">
-        <bitmap android:src="@drawable/ic_sound_bluetooth_holo_dark"
-                android:gravity="center" />
-    </item>
-
-
-    <!-- Handset earpiece is active -->
-    <item android:id="@+id/handsetItem">
-        <bitmap android:src="@drawable/ic_sound_handset_holo_dark"
-                android:gravity="center" />
-    </item>
-
-    <!-- Speakerphone icon showing 'speaker on' state -->
-    <item android:id="@+id/speakerphoneOnItem">
-        <bitmap android:src="@drawable/ic_sound_speakerphone_holo_dark"
-                android:gravity="center" />
-    </item>
-
-    <!-- Speakerphone icon showing 'speaker off' state -->
-    <item android:id="@+id/speakerphoneOffItem">
-        <bitmap android:src="@drawable/ic_sound_off_speakerphone_holo_dark"
-                android:gravity="center" />
-    </item>
-
-    <!-- Generic "audio mode" icon.  Looks almost identical to
-         ic_sound_speakerphone_holo_dark.png -->
-    <!-- TODO: is this actually needed? -->
-    <!--
-        <item android:id="@+id/soundItem">
-            <bitmap android:src="@drawable/ic_sound_holo_dark"
-                    android:gravity="center" />
-        </item>
-    -->
-
-</layer-list>
diff --git a/res/drawable/btn_compound_dialpad.xml b/res/drawable/btn_compound_dialpad.xml
deleted file mode 100644
index b44f2fa..0000000
--- a/res/drawable/btn_compound_dialpad.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 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.
--->
-
-<!-- Layers used to render the in-call "Dialpad" compound button. -->
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <!-- The standard "compound button" background. -->
-    <item android:drawable="@drawable/btn_compound_background" />
-
-    <!-- ...and the actual icon on top.  Use an explicit <bitmap> to avoid scaling
-         the icon up to the full size of the button. -->
-    <item>
-        <bitmap android:src="@drawable/ic_dialpad_holo_dark"
-                android:gravity="center" />
-    </item>
-
-</layer-list>
diff --git a/res/drawable/btn_compound_hold.xml b/res/drawable/btn_compound_hold.xml
deleted file mode 100644
index 50161ea..0000000
--- a/res/drawable/btn_compound_hold.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 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.
--->
-
-<!-- Layers used to render the in-call "Hold" compound button. -->
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <!-- The standard "compound button" background. -->
-    <item android:drawable="@drawable/btn_compound_background" />
-
-    <!-- ...and the actual icon on top.  Use an explicit <bitmap> to avoid scaling
-         the icon up to the full size of the button. -->
-    <item>
-        <bitmap android:src="@drawable/ic_hold_pause_holo_dark"
-                android:gravity="center" />
-    </item>
-
-</layer-list>
diff --git a/res/drawable/btn_compound_mute.xml b/res/drawable/btn_compound_mute.xml
deleted file mode 100644
index 4e09bd9..0000000
--- a/res/drawable/btn_compound_mute.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 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.
--->
-
-<!-- Layers used to render the in-call "Mute" compound button. -->
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <!-- The standard "compound button" background. -->
-    <item android:drawable="@drawable/btn_compound_background" />
-
-    <!-- ...and the actual icon on top.  Use an explicit <bitmap> to avoid scaling
-         the icon up to the full size of the button. -->
-    <item>
-        <bitmap android:src="@drawable/ic_mute_holo_dark"
-                android:gravity="center" />
-    </item>
-
-</layer-list>
diff --git a/res/drawable/clickable_dim_effect.xml b/res/drawable/clickable_dim_effect.xml
deleted file mode 100644
index e4b4f6f..0000000
--- a/res/drawable/clickable_dim_effect.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 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 drawable used with dim effect for secondary photo. -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_pressed="true" android:state_enabled="true"
-          android:drawable="@drawable/list_pressed_holo_dark" />
-    <item android:drawable="@color/on_hold_dim_effect" />
-
-</selector>
diff --git a/res/drawable/dialpad_background_opaque.xml b/res/drawable/dialpad_background_opaque.xml
deleted file mode 100644
index d8792f2..0000000
--- a/res/drawable/dialpad_background_opaque.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 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.
--->
-
-<!-- Opaque version of dialpad_background.xml. -->
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <!-- An opaque black layer underneath. -->
-    <item android:drawable="@android:color/black" />
-
-    <!-- ...and the "dial_background_texture" tiled on top. -->
-    <item>
-        <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-                android:src="@drawable/dial_background_texture"
-                android:tileMode="repeat" />
-    </item>
-
-</layer-list>
diff --git a/res/drawable/end_call_background.xml b/res/drawable/end_call_background.xml
deleted file mode 100644
index 33ec22f..0000000
--- a/res/drawable/end_call_background.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 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 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>
-
-</selector>
diff --git a/res/drawable/ic_in_call_touch_handle.xml b/res/drawable/ic_in_call_touch_handle.xml
deleted file mode 100644
index e657e92..0000000
--- a/res/drawable/ic_in_call_touch_handle.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 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.
--->
-
-<!-- Touch handle for the GlowPadView widget on the incoming call screen -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item
-        android:state_enabled="true"
-        android:state_active="false"
-        android:state_focused="false"
-        android:drawable="@drawable/ic_in_call_touch_handle_normal" />
-
-    <!-- "Pressed" state uses the same simple "ring" image as on the lockscreen -->
-    <item
-        android:state_enabled="true"
-        android:state_active="true"
-        android:state_focused="false"
-        android:drawable="@*android:drawable/ic_lockscreen_handle_pressed" />
-
-</selector>
diff --git a/res/drawable/ic_lockscreen_answer.xml b/res/drawable/ic_lockscreen_answer.xml
deleted file mode 100644
index 3184111..0000000
--- a/res/drawable/ic_lockscreen_answer.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 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.
--->
-<!-- Used with incoming call wigdet. -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:state_enabled="true" android:state_active="false" android:state_focused="false"
-        android:drawable="@drawable/ic_lockscreen_answer_normal_layer"/>
-    <item
-        android:state_enabled="true" android:state_active="true"  android:state_focused="false"
-        android:drawable="@drawable/ic_lockscreen_answer_activated_layer" />
-   <item
-        android:state_enabled="true" android:state_active="false"  android:state_focused="true"
-        android:drawable="@drawable/ic_lockscreen_answer_activated_layer" />
-</selector>
diff --git a/res/drawable/ic_lockscreen_answer_activated_layer.xml b/res/drawable/ic_lockscreen_answer_activated_layer.xml
deleted file mode 100644
index 6889581..0000000
--- a/res/drawable/ic_lockscreen_answer_activated_layer.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 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.
--->
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
-            <solid android:color="#99cc00"/>
-            <size
-                android:width="@dimen/incoming_call_widget_circle_size"
-                android:height="@dimen/incoming_call_widget_circle_size" />
-        </shape>
-    </item>
-    <item
-        android:top="@dimen/incoming_call_widget_asset_margin"
-        android:right="@dimen/incoming_call_widget_asset_margin"
-        android:bottom="@dimen/incoming_call_widget_asset_margin"
-        android:left="@dimen/incoming_call_widget_asset_margin"
-        android:drawable="@drawable/ic_lockscreen_answer_activated" />
-</layer-list>
diff --git a/res/drawable/ic_lockscreen_answer_normal_layer.xml b/res/drawable/ic_lockscreen_answer_normal_layer.xml
deleted file mode 100644
index 083fe3f..0000000
--- a/res/drawable/ic_lockscreen_answer_normal_layer.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 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.
--->
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- A fake circle to fix the size of this layer asset. -->
-    <item>
-        <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
-            <solid android:color="#00000000"/>
-            <size
-                android:width="@dimen/incoming_call_widget_circle_size"
-                android:height="@dimen/incoming_call_widget_circle_size" />
-        </shape>
-    </item>
-    <item
-        android:top="@dimen/incoming_call_widget_asset_margin"
-        android:right="@dimen/incoming_call_widget_asset_margin"
-        android:bottom="@dimen/incoming_call_widget_asset_margin"
-        android:left="@dimen/incoming_call_widget_asset_margin"
-        android:drawable="@drawable/ic_lockscreen_answer_normal" />
-</layer-list>
diff --git a/res/drawable/ic_lockscreen_decline.xml b/res/drawable/ic_lockscreen_decline.xml
deleted file mode 100644
index 6643816..0000000
--- a/res/drawable/ic_lockscreen_decline.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 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.
--->
-<!-- Used with incoming call wigdet. -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:state_enabled="true" android:state_active="false" android:state_focused="false"
-        android:drawable="@drawable/ic_lockscreen_decline_normal_layer" />
-    <item
-        android:state_enabled="true" android:state_active="true"  android:state_focused="false"
-        android:drawable="@drawable/ic_lockscreen_decline_activated_layer" />
-    <item
-        android:state_enabled="true" android:state_active="false"  android:state_focused="true"
-        android:drawable="@drawable/ic_lockscreen_decline_activated_layer" />
-</selector>
diff --git a/res/drawable/ic_lockscreen_decline_activated_layer.xml b/res/drawable/ic_lockscreen_decline_activated_layer.xml
deleted file mode 100644
index e3606d1..0000000
--- a/res/drawable/ic_lockscreen_decline_activated_layer.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 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.
--->
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
-            <solid android:color="#ff4040"/>
-            <size
-                android:width="@dimen/incoming_call_widget_circle_size"
-                android:height="@dimen/incoming_call_widget_circle_size" />
-        </shape>
-    </item>
-    <item
-        android:top="@dimen/incoming_call_widget_asset_margin"
-        android:right="@dimen/incoming_call_widget_asset_margin"
-        android:bottom="@dimen/incoming_call_widget_asset_margin"
-        android:left="@dimen/incoming_call_widget_asset_margin"
-        android:drawable="@drawable/ic_lockscreen_decline_activated" />
-</layer-list>
diff --git a/res/drawable/ic_lockscreen_decline_normal_layer.xml b/res/drawable/ic_lockscreen_decline_normal_layer.xml
deleted file mode 100644
index 2896bef..0000000
--- a/res/drawable/ic_lockscreen_decline_normal_layer.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 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.
--->
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- A fake circle to fix the size of this layer asset. -->
-    <item>
-        <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
-            <solid android:color="#00000000"/>
-            <size
-                android:width="@dimen/incoming_call_widget_circle_size"
-                android:height="@dimen/incoming_call_widget_circle_size" />
-        </shape>
-    </item>
-    <item
-        android:top="@dimen/incoming_call_widget_asset_margin"
-        android:right="@dimen/incoming_call_widget_asset_margin"
-        android:bottom="@dimen/incoming_call_widget_asset_margin"
-        android:left="@dimen/incoming_call_widget_asset_margin"
-        android:drawable="@drawable/ic_lockscreen_decline_normal" />
-</layer-list>
diff --git a/res/drawable/ic_lockscreen_text.xml b/res/drawable/ic_lockscreen_text.xml
deleted file mode 100644
index f9caac8..0000000
--- a/res/drawable/ic_lockscreen_text.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 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.
--->
-<!-- Used with incoming call wigdet. -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:state_enabled="true" android:state_active="false" android:state_focused="false"
-        android:drawable="@drawable/ic_lockscreen_text_normal_layer" />
-    <item
-        android:state_enabled="true" android:state_active="true"  android:state_focused="false"
-        android:drawable="@drawable/ic_lockscreen_text_activated_layer" />
-    <item
-        android:state_enabled="true" android:state_active="false"  android:state_focused="true"
-        android:drawable="@drawable/ic_lockscreen_text_activated_layer" />
-</selector>
diff --git a/res/drawable/ic_lockscreen_text_activated_layer.xml b/res/drawable/ic_lockscreen_text_activated_layer.xml
deleted file mode 100644
index 95141e5..0000000
--- a/res/drawable/ic_lockscreen_text_activated_layer.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 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.
--->
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
-            <solid android:color="#99cc00"/>
-            <size
-                android:width="@dimen/incoming_call_widget_circle_size"
-                android:height="@dimen/incoming_call_widget_circle_size" />
-        </shape>
-    </item>
-    <item
-        android:top="@dimen/incoming_call_widget_asset_margin"
-        android:right="@dimen/incoming_call_widget_asset_margin"
-        android:bottom="@dimen/incoming_call_widget_asset_margin"
-        android:left="@dimen/incoming_call_widget_asset_margin"
-        android:drawable="@drawable/ic_lockscreen_text_activated" />
-</layer-list>
diff --git a/res/drawable/ic_lockscreen_text_normal_layer.xml b/res/drawable/ic_lockscreen_text_normal_layer.xml
deleted file mode 100644
index 42fd51d..0000000
--- a/res/drawable/ic_lockscreen_text_normal_layer.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 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.
--->
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- A fake circle to fix the size of this layer asset. -->
-    <item>
-        <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
-            <solid android:color="#00000000"/>
-            <size
-                android:width="@dimen/incoming_call_widget_circle_size"
-                android:height="@dimen/incoming_call_widget_circle_size" />
-        </shape>
-    </item>
-    <item
-        android:top="@dimen/incoming_call_widget_asset_margin"
-        android:right="@dimen/incoming_call_widget_asset_margin"
-        android:bottom="@dimen/incoming_call_widget_asset_margin"
-        android:left="@dimen/incoming_call_widget_asset_margin"
-        android:drawable="@drawable/ic_lockscreen_text_normal" />
-</layer-list>
diff --git a/res/layout-land/emergency_dialer.xml b/res/layout-land/emergency_dialer.xml
deleted file mode 100644
index 9894a8d..0000000
--- a/res/layout-land/emergency_dialer.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2006 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="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:layout_marginStart="@dimen/dialpad_horizontal_margin"
-    android:layout_marginEnd="@dimen/dialpad_horizontal_margin">
-
-    <!-- Text field above the keypad where the digits are displayed -->
-    <LinearLayout
-        android:id="@+id/digits_container"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/emergency_dialer_digits_height"
-        android:layout_marginTop="@dimen/dialpad_vertical_margin"
-        android:layout_marginBottom="69dip"
-        android:gravity="center"
-        android:background="@drawable/dialpad_background" >
-
-        <EditText
-            android:id="@+id/digits"
-            android:layout_width="0dip"
-            android:layout_weight="1"
-            android:layout_height="match_parent"
-            android:gravity="center"
-            android:scrollHorizontally="true"
-            android:textAppearance="@style/DialtactsDigitsTextAppearance"
-            android:nextFocusRight="@+id/deleteButton"
-            android:background="@android:color/transparent"
-            android:hint="@string/dialerKeyboardHintText" />
-
-        <ImageButton
-            android:id="@+id/deleteButton"
-            android:layout_width="56dip"
-            android:layout_height="match_parent"
-            android:layout_gravity="center_vertical"
-            android:gravity="center"
-            android:state_enabled="false"
-            android:background="?android:attr/selectableItemBackground"
-            android:contentDescription="@string/description_delete_button"
-            android:src="@drawable/ic_dial_action_delete" />
-    </LinearLayout>
-
-    <FrameLayout
-        android:id="@+id/dialButtonContainer"
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1"
-        android:layout_gravity="center_horizontal"
-        android:background="@drawable/dialpad_background">
-
-        <ImageButton
-            android:id="@+id/dialButton"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_gravity="center"
-            android:state_enabled="false"
-            android:background="@drawable/btn_call"
-            android:contentDescription="@string/description_dial_button"
-            android:src="@drawable/ic_dial_action_call" />
-
-    </FrameLayout>
-
-</LinearLayout>
diff --git a/res/layout-land/incall_screen.xml b/res/layout-land/incall_screen.xml
deleted file mode 100644
index 1278115..0000000
--- a/res/layout-land/incall_screen.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 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 Phone UI; see InCallScreen.java. -->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/landscape_incall_screen"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-    <!-- The "Call Card", which displays info about the currently
-         active phone call(s) on the device.  See call_card.xml. -->
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@drawable/background_dial_holo_dark">
-        <include
-            layout="@layout/call_card"
-            android:id="@+id/callCard"
-            android:layout_width="0dp"
-            android:layout_weight="3"
-            android:layout_height="match_parent" />
-        <!-- Note: This center margin is repeated in layout-land/incall_touch_ui
-             Both layouts need to have this margin to be aligned correctly. -->
-        <View
-            android:layout_width="@dimen/dialpad_center_margin"
-            android:layout_weight="0"
-            android:layout_height="match_parent" />
-        <View
-            android:layout_width="0dp"
-            android:layout_weight="2"
-            android:layout_height="match_parent" />
-    </LinearLayout>
-
-    <!-- In-call onscreen touch controls; see InCallTouchUi.java.
-         This widget contains the cluster of buttons shown at the right
-         of the in-call screen, and also the DTMF dialpad (which, when
-         visible, covers the contact picture/call_card on the left half of the screen) -->
-
-    <ViewStub
-        android:id="@+id/inCallTouchUiStub"
-        android:layout="@layout/incall_touch_ui"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-    <ViewStub
-        android:id="@+id/inCallTouchUiCdmaStub"
-        android:layout="@layout/incall_touch_ui_cdma"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-    <!-- ViewStub for OTASP-related UI elements (for the CDMA "activation"
-         call.)  Note that this ViewStub provides the *entire* OTASP
-         screen, including the status area at the top *and* touch controls
-         at the bottom of the screen.  The regular CallCard and the
-         InCallTouchUi widget are not used at all during an OTASP call. -->
-    <ViewStub android:id="@+id/otaCallCardStub"
-              android:layout="@layout/otacall_card"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent" />
-
-    <!-- The "Manage conference" UI.  This panel is displayed (and covers up
-         the entire normal in-call UI) when the user clicks "Manage conference"
-         during a GSM conference call. -->
-    <ViewStub android:id="@+id/manageConferencePanelStub"
-              android:layout="@layout/manage_conference_panel"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent" />
-
-</FrameLayout>
diff --git a/res/layout-land/incall_touch_ui.xml b/res/layout-land/incall_touch_ui.xml
deleted file mode 100644
index c6bbe5c..0000000
--- a/res/layout-land/incall_touch_ui.xml
+++ /dev/null
@@ -1,272 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 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 InCallTouchUi (FrameLayout) with 2 children:
-       (1) inCallControls: the widgets visible while a regular call (or calls) is in progress
-       (2) incomingCallWidget: the UI displayed while an incoming call is ringing
-     In usual cases, one of these is visible at any given moment.
-     One exception is when incomingCallWidget is fading-out. At that moment, we show
-     inCallControls beneath incomingCallWidget for smoother transition.
-     -->
-<com.android.phone.InCallTouchUi xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:prvandroid="http://schemas.android.com/apk/prv/res/android"
-    android:id="@+id/inCallTouchUi"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <!--
-        (1) inCallControls: the widgets visible while a regular call
-        (or calls) is in progress
-    -->
-    <LinearLayout
-        android:id="@+id/inCallControls"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:visibility="gone">
-
-        <!-- DTMF dialpad shown in the left part of the screen.
-             This is wrapped in a FrameLayout because otherwise the ViewStub has no width,
-             causing the other buttons to span the full width of the screen -->
-        <FrameLayout
-            android:layout_width="0dp"
-            android:layout_weight="3"
-            android:layout_height="match_parent">
-            <ViewStub
-                android:id="@+id/dtmf_twelve_key_dialer_stub"
-                android:layout="@layout/dtmf_twelve_key_dialer_view"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent" />
-
-            <!-- The "extra button row": Rare button used for statues such as conference
-                 calls (GSM). Refer to layout(portrait)/incall_touch_ui for more details.
-                 When shown, this extra button row hovers over the call card, just above
-                 the primary_call_banner of layout-land/primary_call_info. -->
-            <ViewStub
-                android:id="@+id/extraButtonRow"
-                android:layout_gravity="bottom"
-                android:layout_marginBottom="@dimen/call_banner_height"
-                android:layout="@layout/extra_button_row"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-        </FrameLayout>
-
-        <!-- Note: This center margin is repeated in layout-land/incall_screen -->
-        <View
-            android:layout_width="@dimen/dialpad_center_margin"
-            android:layout_height="match_parent"
-            android:background="#66000000" />
-
-        <!-- Cluster of buttons on the right part of the screen.
-             It is named id/bottomButtons from the naming when in portrait layout. -->
-        <LinearLayout
-            android:id="@+id/bottomButtons"
-            android:background="@drawable/dialpad_background"
-            android:orientation="vertical"
-            android:layout_width="0dp"
-            android:layout_weight="2"
-            android:layout_height="match_parent">
-
-            <LinearLayout
-                android:layout_height="0dp"
-                android:layout_weight="1"
-                android:layout_width="match_parent">
-                <!-- "Audio mode" -->
-                <!-- This is a multi-mode button that can behave either like a
-                     simple "compound button" with two states *or* like an
-                     action button that brings up a popup menu; see
-                     btn_compound_audio.xml and InCallTouchUi.updateAudioButton()
-                     for the full details. -->
-                <ToggleButton
-                    android:id="@+id/audioButton"
-                    android:layout_width="0dp"
-                    android:layout_weight="1"
-                    android:layout_height="match_parent"
-                    style="@style/InCallCompoundButton"
-                    android:background="@drawable/btn_compound_audio"
-                    android:contentDescription="@string/onscreenAudioText" />
-
-                <View
-                    android:layout_width="@dimen/dialpad_button_margin"
-                    android:layout_height="match_parent"
-                    android:background="#66000000" />
-
-                <!-- This slot is either "Hold" or "Swap", depending on
-                     the state of the call.   One or the other of these
-                     must always be set to GONE. -->
-                <!-- "Hold" -->
-                <!-- This is a "compound button": it has checked and unchecked states. -->
-                <ToggleButton
-                    android:id="@+id/holdButton"
-                    android:layout_width="0dp"
-                    android:layout_weight="1"
-                    android:layout_height="match_parent"
-                    style="@style/InCallCompoundButton"
-                    android:background="@drawable/btn_compound_hold"
-                    android:contentDescription="@string/onscreenHoldText" />
-                <!-- "Swap" (or "Manage calls" in some CDMA states) -->
-                <ImageButton
-                    android:id="@+id/swapButton"
-                    android:layout_width="0dp"
-                    android:layout_weight="1"
-                    android:layout_height="match_parent"
-                    style="@style/InCallButton"
-                    android:src="@drawable/ic_incall_switch_holo_dark"
-                    android:contentDescription="@string/onscreenSwapCallsText" />
-            </LinearLayout>
-
-            <View
-                android:layout_height="@dimen/dialpad_button_margin"
-                android:layout_width="match_parent"
-                android:background="#66000000" />
-
-            <LinearLayout
-                android:layout_height="0dp"
-                android:layout_weight="1"
-                android:layout_width="match_parent">
-                <ToggleButton
-                    android:id="@+id/muteButton"
-                    android:layout_width="0dp"
-                    android:layout_weight="1"
-                    android:layout_height="match_parent"
-                    style="@style/InCallCompoundButton"
-                    android:background="@drawable/btn_compound_mute"
-                    android:contentDescription="@string/onscreenMuteText" />
-                <View
-                    android:layout_width="@dimen/dialpad_button_margin"
-                    android:layout_height="match_parent"
-                    android:background="#66000000" />
-
-                <!-- "Video call" -->
-                <ImageButton
-                    android:id="@+id/videoCallButton"
-                    android:layout_width="0dp"
-                    android:layout_weight="1"
-                    android:layout_height="match_parent"
-                    style="@style/InCallButton"
-                    android:src="@drawable/ic_videocall_holo_dark"
-                    android:contentDescription="@string/onscreenVideoCallText" />
-            </LinearLayout>
-
-            <View
-                android:layout_height="@dimen/dialpad_button_margin"
-                android:layout_width="match_parent"
-                android:background="#66000000" />
-
-            <LinearLayout
-                android:layout_height="0dp"
-                android:layout_weight="1"
-                android:layout_width="match_parent">
-                <ToggleButton
-                    android:id="@+id/dialpadButton"
-                    android:layout_width="0dp"
-                    android:layout_weight="1"
-                    android:layout_height="match_parent"
-                    style="@style/InCallCompoundButton"
-                    android:background="@drawable/btn_compound_dialpad"
-                    android:contentDescription="@string/onscreenShowDialpadText" />
-                <View
-                    android:layout_width="@dimen/dialpad_button_margin"
-                    android:layout_height="match_parent"
-                    android:background="#66000000" />
-                <!-- This slot is either "Add" or "Merge", depending on
-                     the state of the call.  One or the other of these
-                     must always be set to GONE. -->
-                <!-- "Add Call" -->
-                <ImageButton
-                    android:id="@+id/addButton"
-                    android:layout_width="0dp"
-                    android:layout_weight="1"
-                    android:layout_height="match_parent"
-                    style="@style/InCallButton"
-                    android:src="@drawable/ic_add_contact_holo_dark"
-                    android:contentDescription="@string/onscreenAddCallText" />
-                <!-- "Merge calls" -->
-                <!-- This button is used only on GSM devices, where we know
-                     that "Add" and "Merge" are never available at the same time.
-                     The "Merge" button for CDMA devices is "cdmaMergeButton" above. -->
-                <ImageButton
-                    android:id="@+id/mergeButton"
-                    android:layout_width="0dp"
-                    android:layout_weight="1"
-                    android:layout_height="match_parent"
-                    style="@style/InCallButton"
-                    android:src="@drawable/ic_merge_holo_dark"
-                    android:contentDescription="@string/onscreenMergeCallsText" />
-            </LinearLayout>
-
-            <!-- This spacer is not used in GSM, so it has 0 width and height. The CDMA
-                 incall_touch_ui_cdma uses it as a spacer when a 5th button is shown. -->
-            <View
-                android:id="@+id/holdSwapSpacer"
-                android:layout_width="0dp"
-                android:layout_height="0dp" />
-            <View
-                android:layout_height="@dimen/dialpad_button_margin"
-                android:layout_width="match_parent"
-                android:background="#66000000" />
-            <ImageButton
-                android:id="@+id/endButton"
-                android:layout_height="@dimen/in_call_end_button_height"
-                android:layout_width="match_parent"
-                android:src="@drawable/ic_dial_end_call"
-                android:background="@drawable/end_call_background"
-                android:contentDescription="@string/onscreenEndCallText" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <!--
-        (2) incomingCallWidget: the UI displayed while an incoming call is ringing.
-            See InCallTouchUi.showIncomingCallWidget().
-
-            Layout notes:
-            - Use an opaque black background since we need to cover up
-              a bit of the bottom of the contact photo
-            - The verticalOffset value gets us a little extra space above
-              the topmost "Respond by SMS" icon
-            - The negative layout_marginBottom shifts us slightly downward;
-              we're already aligned with the bottom of the screen, but we
-              don't have an icon in the downward direction so the whole
-              bottom area of this widget is just wasted space.
-    -->
-    <com.android.internal.widget.multiwaveview.GlowPadView
-        android:id="@+id/incomingCallWidget"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_gravity="right"
-        android:background="@android:color/black"
-        android:visibility="gone"
-        android:gravity="top"
-
-        prvandroid:targetDrawables="@array/incoming_call_widget_3way_targets"
-        prvandroid:targetDescriptions="@array/incoming_call_widget_3way_target_descriptions"
-        prvandroid:directionDescriptions="@array/incoming_call_widget_3way_direction_descriptions"
-        prvandroid:handleDrawable="@drawable/ic_in_call_touch_handle"
-        prvandroid:innerRadius="@*android:dimen/glowpadview_inner_radius"
-        prvandroid:outerRadius="@*android:dimen/glowpadview_target_placement_radius"
-        prvandroid:outerRingDrawable="@*android:drawable/ic_lockscreen_outerring"
-        prvandroid:snapMargin="@*android:dimen/glowpadview_snap_margin"
-        prvandroid:vibrationDuration="20"
-        prvandroid:feedbackCount="1"
-        prvandroid:glowRadius="@*android:dimen/glowpadview_glow_radius"
-        prvandroid:pointDrawable="@*android:drawable/ic_lockscreen_glowdot"
-        />
-
-</com.android.phone.InCallTouchUi>
diff --git a/res/layout-land/incall_touch_ui_cdma.xml b/res/layout-land/incall_touch_ui_cdma.xml
deleted file mode 100644
index 6b95164..0000000
--- a/res/layout-land/incall_touch_ui_cdma.xml
+++ /dev/null
@@ -1,250 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 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 InCallTouchUi (FrameLayout) with 2 children:
-       (1) inCallControls: the widgets visible while a regular call (or calls) is in progress
-       (2) incomingCallWidget: the UI displayed while an incoming call is ringing
-     In usual cases, one of these is visible at any given moment.
-     One exception is when incomingCallWidget is fading-out. At that moment, we show
-     inCallControls beneath incomingCallWidget for smoother transition.
-     -->
-<com.android.phone.InCallTouchUi xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:prvandroid="http://schemas.android.com/apk/prv/res/android"
-    android:id="@+id/inCallTouchUi"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <!--
-        (1) inCallControls: the widgets visible while a regular call
-        (or calls) is in progress
-    -->
-    <LinearLayout
-        android:id="@+id/inCallControls"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:visibility="gone">
-
-        <!-- DTMF dialpad shown in the left part of the screen.
-             This is wrapped in a FrameLayout because otherwise the ViewStub has no width,
-             causing the other buttons to span the full width of the screen -->
-        <FrameLayout
-            android:layout_width="0dp"
-            android:layout_weight="3"
-            android:layout_height="match_parent">
-            <ViewStub
-                android:id="@+id/dtmf_twelve_key_dialer_stub"
-                android:layout="@layout/dtmf_twelve_key_dialer_view"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent" />
-
-            <!-- The "extra button row": Rare button used for statues such as conference
-                 calls (GSM). Refer to layout(portrait)/incall_touch_ui for more details.
-                 When shown, this extra button row hovers over the call card, just above
-                 the primary_call_banner of layout-land/primary_call_info.
-                 I believe, since this is the CDMA layout, that the button might not be shown. -->
-            <ViewStub
-                android:id="@+id/extraButtonRow"
-                android:layout_gravity="bottom"
-                android:layout_marginBottom="@dimen/call_banner_height"
-                android:layout="@layout/extra_button_row"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-        </FrameLayout>
-
-            <!-- "Audio mode" -->
-            <!-- This is a multi-mode button that can behave either like a
-                 simple "compound button" with two states *or* like an
-                 action button that brings up a popup menu; see
-                 btn_compound_audio.xml and InCallTouchUi.updateAudioButton()
-                 for the full details. -->
-            <ToggleButton
-                android:id="@+id/audioButton"
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="match_parent"
-                style="@style/InCallCompoundButton"
-                android:background="@drawable/btn_compound_audio"
-                android:contentDescription="@string/onscreenAudioText" />
-
-        <!-- Note: This center margin is repeated in layout-land/incall_screen -->
-        <View
-            android:layout_width="@dimen/dialpad_center_margin"
-            android:layout_height="match_parent"
-            android:background="#66000000" />
-
-        <!-- Cluster of buttons on the right part of the screen.
-             It is named id/bottomButtons from the naming when in portrait layout. -->
-        <LinearLayout
-            android:id="@+id/bottomButtons"
-            android:background="@drawable/dialpad_background"
-            android:orientation="vertical"
-            android:layout_width="0dp"
-            android:layout_weight="2"
-            android:layout_height="match_parent">
-
-
-            <View
-                android:id="@+id/holdSwapSpacer"
-                android:layout_height="@dimen/dialpad_button_margin"
-                android:layout_width="match_parent"
-                android:background="#66000000" />
-
-            <LinearLayout
-                android:layout_height="0dp"
-                android:layout_weight="1"
-                android:layout_width="match_parent">
-                <ToggleButton
-                    android:id="@+id/muteButton"
-                    android:layout_width="0dp"
-                    android:layout_weight="1"
-                    android:layout_height="match_parent"
-                    style="@style/InCallCompoundButton"
-                    android:background="@drawable/btn_compound_mute"
-                    android:contentDescription="@string/onscreenMuteText" />
-                <View
-                    android:layout_width="@dimen/dialpad_button_margin"
-                    android:layout_height="match_parent"
-                    android:background="#66000000" />
-
-                <!-- This slot is either "Hold" or "Swap", depending on
-                     the state of the call.   One or the other of these
-                     must always be set to GONE. -->
-                <!-- "Hold" -->
-                <!-- This is a "compound button": it has checked and unchecked states. -->
-                <ToggleButton
-                    android:id="@+id/holdButton"
-                    android:layout_height="0dp"
-                    android:layout_weight="1"
-                    android:layout_width="match_parent"
-                    style="@style/InCallCompoundButton"
-                    android:background="@drawable/btn_compound_hold"
-                    android:contentDescription="@string/onscreenHoldText" />
-                <!-- "Swap" (or "Manage calls" in some CDMA states) -->
-                <ImageButton
-                    android:id="@+id/swapButton"
-                    android:layout_height="0dp"
-                    android:layout_weight="1"
-                    android:layout_width="match_parent"
-                    style="@style/InCallButton"
-                    android:src="@drawable/ic_incall_switch_holo_dark"
-                    android:contentDescription="@string/onscreenSwapCallsText" />
-
-            </LinearLayout>
-
-            <View
-                android:layout_height="@dimen/dialpad_button_margin"
-                android:layout_width="match_parent"
-                android:background="#66000000" />
-
-            <LinearLayout
-                android:layout_height="0dp"
-                android:layout_weight="1"
-                android:layout_width="match_parent">
-                <ToggleButton
-                    android:id="@+id/dialpadButton"
-                    android:layout_width="0dp"
-                    android:layout_weight="1"
-                    android:layout_height="match_parent"
-                    style="@style/InCallCompoundButton"
-                    android:background="@drawable/btn_compound_dialpad"
-                    android:contentDescription="@string/onscreenShowDialpadText" />
-                <View
-                    android:layout_width="@dimen/dialpad_button_margin"
-                    android:layout_height="match_parent"
-                    android:background="#66000000" />
-                <!-- This slot is either "Add" or "Merge", depending on
-                     the state of the call.  One or the other of these
-                     must always be set to GONE. -->
-                <!-- "Add Call" -->
-                <ImageButton
-                    android:id="@+id/addButton"
-                    android:layout_width="0dp"
-                    android:layout_weight="1"
-                    android:layout_height="match_parent"
-                    style="@style/InCallButton"
-                    android:src="@drawable/ic_add_contact_holo_dark"
-                    android:contentDescription="@string/onscreenAddCallText" />
-                <!-- "Merge calls" -->
-                <!-- This button is used only on GSM devices, where we know
-                     that "Add" and "Merge" are never available at the same time.
-                     The "Merge" button for CDMA devices is "cdmaMergeButton" above. -->
-                <ImageButton
-                    android:id="@+id/mergeButton"
-                    android:layout_width="0dp"
-                    android:layout_weight="1"
-                    android:layout_height="match_parent"
-                    style="@style/InCallButton"
-                    android:src="@drawable/ic_merge_holo_dark"
-                    android:contentDescription="@string/onscreenMergeCallsText" />
-            </LinearLayout>
-
-            <View
-                android:layout_height="@dimen/dialpad_button_margin"
-                android:layout_width="match_parent"
-                android:background="#66000000" />
-            <ImageButton
-                android:id="@+id/endButton"
-                android:layout_height="@dimen/in_call_end_button_height"
-                android:layout_width="match_parent"
-                android:src="@drawable/ic_dial_end_call"
-                android:background="@drawable/end_call_background"
-                android:contentDescription="@string/onscreenEndCallText" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <!--
-        (2) incomingCallWidget: the UI displayed while an incoming call is ringing.
-            See InCallTouchUi.showIncomingCallWidget().
-
-            Layout notes:
-            - Use an opaque black background since we need to cover up
-              a bit of the bottom of the contact photo
-            - The verticalOffset value gets us a little extra space above
-              the topmost "Respond by SMS" icon
-            - The negative layout_marginBottom shifts us slightly downward;
-              we're already aligned with the bottom of the screen, but we
-              don't have an icon in the downward direction so the whole
-              bottom area of this widget is just wasted space.
-    -->
-    <com.android.internal.widget.multiwaveview.GlowPadView
-        android:id="@+id/incomingCallWidget"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_gravity="right"
-        android:background="@android:color/black"
-        android:visibility="gone"
-        android:gravity="top"
-
-        prvandroid:targetDrawables="@array/incoming_call_widget_3way_targets"
-        prvandroid:targetDescriptions="@array/incoming_call_widget_3way_target_descriptions"
-        prvandroid:directionDescriptions="@array/incoming_call_widget_3way_direction_descriptions"
-        prvandroid:handleDrawable="@drawable/ic_in_call_touch_handle"
-        prvandroid:innerRadius="@*android:dimen/glowpadview_inner_radius"
-        prvandroid:outerRadius="@*android:dimen/glowpadview_target_placement_radius"
-        prvandroid:outerRingDrawable="@*android:drawable/ic_lockscreen_outerring"
-        prvandroid:snapMargin="@*android:dimen/glowpadview_snap_margin"
-        prvandroid:vibrationDuration="20"
-        prvandroid:feedbackCount="1"
-        prvandroid:glowRadius="@*android:dimen/glowpadview_glow_radius"
-        prvandroid:pointDrawable="@*android:drawable/ic_lockscreen_glowdot"
-        />
-
-</com.android.phone.InCallTouchUi>
diff --git a/res/layout/call_card.xml b/res/layout/call_card.xml
deleted file mode 100644
index 3803957..0000000
--- a/res/layout/call_card.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2013 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 CallCard used in the Phone app.
-
-     Note that the CallCard is technically the size of the full screen (since
-     our parent container is full-screen, and the layout_width and layout_height
-     here are both "match_parent"), but we manually adjust its bottom margin
-     in CallCard.updateCallInfoLayout() to make sure it doesn't overlap with
-     the onscreen buttons from incall_touch_ui.xml. -->
-<com.android.phone.CallCard xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/call_info_container"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <!-- The main content of the CallCard is either one or two "call info"
-         blocks, depending on whether one or two lines are in use.
-
-         The call_info blocks are stacked vertically inside a CallCard (LinearLayout),
-         each with layout_weight="1".  If only one line is in use (i.e. the
-         common case) then the 2nd call info will be GONE and thus the 1st one
-         will expand to fill the full height of the CallCard.
-
-         We set a bottom margin on this element dynamically (see
-         updateCallInfoLayout()) to make sure it doesn't overlap with either
-         the bottom button cluster or the incoming-call widget. -->
-
-    <!-- Primary "Call info" block, for the foreground call. -->
-    <include android:id="@+id/primary_call_info"
-         layout="@layout/primary_call_info" />
-
-    <!-- Secondary "Call info" block , for the background ("on hold") call. -->
-    <ViewStub android:id="@+id/secondary_call_info"
-         android:layout="@layout/secondary_call_info"
-         android:layout_width="match_parent"
-         android:layout_height="0dp"
-         android:layout_weight="1" />
-
-</com.android.phone.CallCard>
diff --git a/res/layout/caller_in_conference.xml b/res/layout/caller_in_conference.xml
deleted file mode 100644
index c2c68c8..0000000
--- a/res/layout/caller_in_conference.xml
+++ /dev/null
@@ -1,107 +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.
--->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="64dp"
-    android:orientation="horizontal"
-    android:gravity="center_vertical">
-
-    <!-- Caller information -->
-    <LinearLayout
-        android:id="@+id/conferenceCallerSeparate"
-        android:layout_width="0dp"
-        android:layout_weight="1"
-        android:layout_height="match_parent"
-        android:background="?android:attr/selectableItemBackground"
-        android:paddingStart="16dp"
-        android:orientation="horizontal"
-        android:gravity="center_vertical">
-
-        <!-- "Separate" (i.e. "go private") button for this caller -->
-        <ImageView
-            android:src="@drawable/ic_split_holo_dark"
-            android:layout_width="46dp"
-            android:layout_height="46dp"
-            android:scaleType="center"
-            android:contentDescription="@string/goPrivate"/>
-
-        <LinearLayout
-             android:layout_width="match_parent"
-             android:layout_height="wrap_content"
-             android:paddingStart="8dp"
-             android:gravity="center_vertical"
-             android:orientation="vertical">
-
-            <!-- Name or number of this caller -->
-            <TextView
-                 android:id="@+id/conferenceCallerName"
-                 android:textAppearance="?android:attr/textAppearanceLarge"
-                 android:textSize="18sp"
-                 android:singleLine="true"
-                 android:layout_width="wrap_content"
-                 android:layout_height="match_parent"
-                 android:layout_marginEnd="2dp"
-                 />
-
-            <!-- Number of this caller if name is supplied above -->
-            <LinearLayout
-                 android:layout_width="wrap_content"
-                 android:layout_height="match_parent"
-                 android:orientation="horizontal"
-                 android:gravity="bottom">
-
-                <!-- Number -->
-                <TextView
-                     android:id="@+id/conferenceCallerNumber"
-                     android:layout_width="wrap_content"
-                     android:layout_height="wrap_content"
-                     android:textSize="14sp"
-                     android:ellipsize="marquee"
-                     android:textColor="@color/manage_conference_secondary_text_color"
-                     android:singleLine="true"
-                     android:layout_marginEnd="8dp" />
-
-                <!-- Number type -->
-                <TextView
-                    android:id="@+id/conferenceCallerNumberType"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textSize="12sp"
-                    android:textColor="@color/manage_conference_secondary_text_color"
-                    android:ellipsize="marquee"
-                    android:singleLine="true"
-                    android:textAllCaps="true"
-                    android:gravity="start" />
-
-            </LinearLayout>  <!-- End of caller number -->
-
-        </LinearLayout>  <!-- End of caller information -->
-    </LinearLayout>
-
-    <!-- "End" button for this caller which should look like the
-         "end call" button in the main in-call UI screen -->
-    <ImageButton
-         android:id="@+id/conferenceCallerDisconnect"
-         android:layout_width="80dp"
-         android:layout_height="match_parent"
-         android:src="@drawable/ic_end_call_holo_dark"
-         android:background="@drawable/end_call_background"
-         android:scaleType="center"
-         android:contentDescription="@string/onscreenEndCallText" />
-
-</LinearLayout>  <!-- End of single list element -->
diff --git a/res/layout/dtmf_twelve_key_dialer_view.xml b/res/layout/dtmf_twelve_key_dialer_view.xml
deleted file mode 100644
index f1d7c8d..0000000
--- a/res/layout/dtmf_twelve_key_dialer_view.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?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.
--->
-
-<!-- Onscreen in-call DTMF dialpad.  This element contains the grid of
-     DTMF buttons (dialpad.xml) along with a TextView showing
-     the digits you've typed.
-
-     When the user presses the "Dialpad" button, this UI appears in the
-     upper part of the in-call screen, covering up the "call card" area.
-     The regular in-call controls (i.e. the InCallTouchUi widget) are
-     still visible at the lower part of the screen.
-
-     This layout is inflated in place of dtmf_twelve_key_dialer_stub
-     in incall_touch_ui.xml. -->
-<com.android.phone.DTMFTwelveKeyDialerView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/dtmf_twelve_key_dialer_view"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:layout_marginTop="1dip"
-    android:visibility="gone"
-    >
-
-    <!-- Display of the digits you've typed so far.
-         This widget appears completely non-interactive to the user: you
-         can't edit or "hit backspace" since these are DTMF tones you've
-         already sent over the network.  But it's still an EditText rather
-         than a TextView because it needs to receive key events from a
-         hard keyboard, if present (see mDialerKeyListener). -->
-    <EditText
-        android:id="@+id/dtmfDialerField"
-        android:layout_width="match_parent"
-        android:layout_height="32dp"
-        android:layout_marginTop="10dp"
-        android:layout_marginBottom="5dp"
-        android:layout_marginStart="32dp"
-        android:layout_marginEnd="32dp"
-        android:paddingEnd="16dp"
-        android:paddingStart="16dp"
-        android:singleLine="true"
-        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 -->
-    <include layout="@layout/dialpad" />
-
-</com.android.phone.DTMFTwelveKeyDialerView>
diff --git a/res/layout/extra_button_row.xml b/res/layout/extra_button_row.xml
deleted file mode 100644
index 3f7e18c..0000000
--- a/res/layout/extra_button_row.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 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.
--->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@drawable/dialpad_background_opaque">
-    <!-- The buttons here have a text label floating off to the side
-         (which is necessary because these buttons are used only in
-         a few rare states, and the meaning of the icon might not be
-         obvious.)  The entire row (button + text) is clickable. -->
-
-    <!-- "Manage conference" -->
-    <!-- This button is used only on GSM devices, during a conference call. -->
-    <LinearLayout android:id="@+id/manageConferenceButton"
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingStart="@dimen/button_cluster_side_padding"
-        android:paddingEnd="@dimen/button_cluster_side_padding"
-        android:background="?android:attr/selectableItemBackground">
-        <!-- The entire LinearLayout here is clickable, so we don't
-             care about clicks on the ImageButton itself. -->
-        <ImageButton android:id="@+id/manageConferenceButtonImage"
-            android:clickable="false"
-            style="@style/InCallExtraRowButton"
-            android:src="@drawable/ic_groups_holo_dark"
-            android:contentDescription="@string/onscreenManageConferenceText" />
-        <TextView android:id="@+id/manageConferenceButtonLabel"
-            style="@style/InCallExtraRowButtonLabel"
-            android:text="@string/onscreenManageConferenceText" />
-    </LinearLayout>
-
-    <!-- CDMA-specific "Merge" -->
-    <!-- This button is used only on CDMA devices, where we can't use
-         the Merge button in the main button row (because the "Add Call"
-         button might need to be enabled at the same time.) -->
-    <LinearLayout android:id="@+id/cdmaMergeButton"
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingStart="@dimen/button_cluster_side_padding"
-        android:paddingEnd="@dimen/button_cluster_side_padding"
-        android:background="?android:attr/selectableItemBackground">
-        <!-- The entire LinearLayout here is clickable, so we don't
-             care about clicks on the ImageButton itself. -->
-        <ImageButton android:id="@+id/cdmaMergeButtonImage"
-            android:clickable="false"
-            style="@style/InCallExtraRowButton"
-            android:src="@drawable/ic_merge_holo_dark"
-            android:contentDescription="@string/onscreenMergeCallsText" />
-        <TextView android:id="@+id/cdmaMergeButtonLabel"
-            style="@style/InCallExtraRowButtonLabel"
-            android:text="@string/onscreenMergeCallsText" />
-    </LinearLayout>
-
-</FrameLayout>
diff --git a/res/layout/incall_touch_ui.xml b/res/layout/incall_touch_ui.xml
deleted file mode 100644
index 6099f41..0000000
--- a/res/layout/incall_touch_ui.xml
+++ /dev/null
@@ -1,244 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2013 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 InCallTouchUi (FrameLayout) with 2 children:
-       (1) inCallControls: the widgets visible while a regular call (or calls) is in progress
-       (2) incomingCallWidget: the UI displayed while an incoming call is ringing
-     In usual cases, one of these is visible at any given moment.
-     One exception is when incomingCallWidget is fading-out. At that moment, we show
-     inCallControls beneath incomingCallWidget for smoother transition.
-     -->
-<com.android.phone.InCallTouchUi xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:prvandroid="http://schemas.android.com/apk/prv/res/android"
-    android:id="@+id/inCallTouchUi"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    >
-
-    <!--
-        (1) inCallControls: the widgets visible while a regular call
-        (or calls) is in progress
-    -->
-    <RelativeLayout android:id="@+id/inCallControls"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:visibility="gone"
-                    >
-        <!-- DTMF dialpad shown in the upper part of the screen
-             (above the main cluster of buttons.) -->
-        <ViewStub android:id="@+id/dtmf_twelve_key_dialer_stub"
-                  android:layout="@layout/dtmf_twelve_key_dialer_view"
-                  android:layout_width="match_parent"
-                  android:layout_height="match_parent"
-                  android:layout_above="@+id/bottomButtons"
-                  android:layout_marginBottom="@dimen/dialpad_vertical_margin" />
-
-        <!-- Main cluster of onscreen buttons on the lower part of the screen. -->
-        <LinearLayout android:id="@+id/bottomButtons"
-                      android:orientation="vertical"
-                      android:layout_width="match_parent"
-                      android:layout_height="wrap_content"
-                      android:layout_alignParentBottom="true">
-
-            <!-- Row 1, the "extra button row": A couple of relatively rare
-                 buttons used only in certain call states.
-                 Most of the time this whole row is GONE.
-                 For now, at least, there's only ever one button visible here
-                 at a time, so this can be a simple FrameLayout. -->
-            <ViewStub android:id="@+id/extraButtonRow"
-                      android:layout="@layout/extra_button_row"
-                      android:layout_width="match_parent"
-                      android:layout_height="wrap_content" />
-
-            <!-- Row 2: The "End call" button. -->
-            <ImageButton android:id="@+id/endButton"
-                style="@style/InCallEndButton"
-                android:layout_width="match_parent"
-                android:src="@drawable/ic_dial_end_call"
-                android:background="@drawable/end_call_background"
-                android:contentDescription="@string/onscreenEndCallText" />
-
-            <!-- Row 3: The main batch of in-call buttons:
-                    Dialpad / Audio mode / Mute / Hold / Add call
-                 Visible in all states except while an incoming call is
-                 ringing. -->
-            <LinearLayout
-                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"
-                >
-
-                <!-- This row has either 4 or 5 buttons, depending on
-                     whether the device supports "Hold" (i.e. 4 buttons on
-                     CDMA devices, 5 buttons on GSM devices.)  The buttons
-                     are interspersed with 'layout_weight="1"' placeholder
-                     views so that they'll be spaced evenly in both cases.
-
-                     But note there are a couple of *pairs* of buttons that share a
-                     single "slot", namely Hold/Swap and Add/Merge.  For these, the
-                     code in InCallTouchUi is responsible for making sure that at any
-                     point exactly one of the pair is VISIBLE and the other is
-                     GONE. -->
-
-                <!-- Separator between left padding and 1st button -->
-                <View style="@style/VerticalSeparator" />
-
-                <!-- "Dialpad" -->
-                <!-- This is a "compound button": it has checked and unchecked states. -->
-                <ToggleButton android:id="@+id/dialpadButton"
-                    style="@style/InCallCompoundButton"
-                    android:background="@drawable/btn_compound_dialpad"
-                    android:contentDescription="@string/onscreenShowDialpadText"
-                    />
-
-                <!-- Separator between 1st and 2nd button -->
-                <View style="@style/VerticalSeparator" />
-
-                <!-- "Audio mode" -->
-                <!-- This is a multi-mode button that can behave either like a
-                     simple "compound button" with two states *or* like an
-                     action button that brings up a popup menu; see
-                     btn_compound_audio.xml and InCallTouchUi.updateAudioButton()
-                     for the full details. -->
-                <ToggleButton android:id="@+id/audioButton"
-                    style="@style/InCallCompoundButton"
-                    android:background="@drawable/btn_compound_audio"
-                    android:contentDescription="@string/onscreenAudioText"
-                    />
-
-                <!-- Separator between 2nd and 3rd button -->
-                <View style="@style/VerticalSeparator" />
-
-                <!-- "Mute" -->
-                <!-- This is a "compound button": it has checked and unchecked states. -->
-                <ToggleButton android:id="@+id/muteButton"
-                    style="@style/InCallCompoundButton"
-                    android:background="@drawable/btn_compound_mute"
-                    android:contentDescription="@string/onscreenMuteText"
-                    />
-
-                <!-- Separator between 3rd and 4th button -->
-                <View style="@style/VerticalSeparator" />
-
-                <!-- This slot is either "Hold" or "Swap", depending on
-                     the state of the call.   One or the other of these
-                     must always be set to GONE. -->
-                <!-- "Hold" -->
-                <!-- This is a "compound button": it has checked and unchecked states. -->
-                <ToggleButton android:id="@+id/holdButton"
-                    style="@style/InCallCompoundButton"
-                    android:background="@drawable/btn_compound_hold"
-                    android:contentDescription="@string/onscreenHoldText"
-                    />
-                <!-- "Swap" (or "Manage calls" in some CDMA states) -->
-                <ImageButton android:id="@+id/swapButton"
-                    style="@style/InCallButton"
-                    android:src="@drawable/ic_incall_switch_holo_dark"
-                    android:contentDescription="@string/onscreenSwapCallsText"
-                    />
-
-                <!-- Separator between 4th and 5th button (if 5th exists) -->
-                <View android:id="@+id/holdSwapSpacer"
-                      style="@style/VerticalSeparator" />
-
-                <!-- This slot is either "Add" or "Merge", depending on
-                     the state of the call.  One or the other of these
-                     must always be set to GONE. -->
-                <!-- "Add Call" -->
-                <ImageButton android:id="@+id/addButton"
-                    style="@style/InCallButton"
-                    android:src="@drawable/ic_add_contact_holo_dark"
-                    android:contentDescription="@string/onscreenAddCallText"
-                    />
-                <!-- "Merge calls" -->
-                <!-- This button is used only on GSM devices, where we know
-                     that "Add" and "Merge" are never available at the same time.
-                     The "Merge" button for CDMA devices is "cdmaMergeButton" above. -->
-                <ImageButton android:id="@+id/mergeButton"
-                    style="@style/InCallButton"
-                    android:src="@drawable/ic_merge_holo_dark"
-                    android:contentDescription="@string/onscreenMergeCallsText"
-                    />
-
-                <!-- Separator between 5th and 6th button (if 6th exists) -->
-                <View android:id="@+id/videoCallSpacer"
-                    style="@style/VerticalSeparator" />
-
-                <!-- This button is use for converting an ongoing call into a video call. -->
-                <ImageButton android:id="@+id/videoCallButton"
-                    style="@style/InCallButton"
-                    android:src="@drawable/ic_videocall_holo_dark"
-                    android:contentDescription="@string/onscreenVideoCallText"
-                    />
-
-                <!-- Separator between 4th (or 5th) button and right padding -->
-                <View style="@style/VerticalSeparator" />
-
-            </LinearLayout>
-
-        </LinearLayout>
-
-    </RelativeLayout>
-
-    <!--
-        (2) incomingCallWidget: the UI displayed while an incoming call is ringing.
-            See InCallTouchUi.showIncomingCallWidget().
-
-            Layout notes:
-            - Use an opaque black background since we need to cover up
-              a bit of the bottom of the contact photo
-            - The verticalOffset value gets us a little extra space above
-              the topmost "Respond by SMS" icon
-            - The negative layout_marginBottom shifts us slightly downward;
-              we're already aligned with the bottom of the screen, but we
-              don't have an icon in the downward direction so the whole
-              bottom area of this widget is just wasted space.
-    -->
-    <com.android.internal.widget.multiwaveview.GlowPadView
-        android:id="@+id/incomingCallWidget"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center|bottom"
-        android:layout_marginTop="20dip"
-        android:layout_marginBottom="-46dp"
-        android:background="@android:color/black"
-        android:visibility="gone"
-        android:gravity="top"
-
-        prvandroid:targetDrawables="@array/incoming_call_widget_3way_targets"
-        prvandroid:targetDescriptions="@array/incoming_call_widget_3way_target_descriptions"
-        prvandroid:directionDescriptions="@array/incoming_call_widget_3way_direction_descriptions"
-        prvandroid:handleDrawable="@drawable/ic_in_call_touch_handle"
-        prvandroid:innerRadius="@*android:dimen/glowpadview_inner_radius"
-        prvandroid:outerRadius="@*android:dimen/glowpadview_target_placement_radius"
-        prvandroid:outerRingDrawable="@*android:drawable/ic_lockscreen_outerring"
-        prvandroid:snapMargin="@*android:dimen/glowpadview_snap_margin"
-        prvandroid:vibrationDuration="20"
-        prvandroid:feedbackCount="1"
-        prvandroid:glowRadius="@*android:dimen/glowpadview_glow_radius"
-        prvandroid:pointDrawable="@*android:drawable/ic_lockscreen_glowdot"
-        />
-
-</com.android.phone.InCallTouchUi>
diff --git a/res/layout/manage_conference_panel.xml b/res/layout/manage_conference_panel.xml
deleted file mode 100644
index f1fbfdf..0000000
--- a/res/layout/manage_conference_panel.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-<?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:background="#FF000000"
-                android:layout_width="match_parent"
-                android:layout_height="match_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="match_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="match_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 -->
-
-    <!-- Header which looks like ActionBar. -->
-    <FrameLayout
-        android:id="@+id/manageConferenceHeader"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@*android:drawable/ab_transparent_dark_holo">
-
-        <LinearLayout
-            android:id="@+id/manage_done"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="?android:attr/selectableItemBackground"
-            android:clickable="true"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:src="?android:attr/homeAsUpIndicator"
-                android:layout_gravity="center_vertical|left"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="?android:attr/actionBarSize"
-                style="@*android:style/TextAppearance.Holo.Widget.ActionBar.Title"
-                android:gravity="center_vertical"
-                android:text="@string/manageConferenceLabel"/>
-        </LinearLayout>
-
-    </FrameLayout>  <!-- End of 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="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/manageConferenceHeader">
-
-        <!-- The actual list of callers; this embedded LinearLayout
-             required since scrollview only supports a single child. -->
-        <LinearLayout
-            android:orientation="vertical"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:showDividers="middle|end"
-            android:divider="?android:attr/listDivider">
-
-            <!-- 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 -->
-
-</RelativeLayout>
diff --git a/res/layout/primary_call_info.xml b/res/layout/primary_call_info.xml
deleted file mode 100644
index aeeeec5..0000000
--- a/res/layout/primary_call_info.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 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 primary call info, which will be used by CallCard.
-     See also call_card.xml. -->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="0dp"
-    android:layout_weight="1">
-
-    <!-- Contact photo for primary call info -->
-    <ImageView android:id="@+id/photo"
-         android:layout_alignParentStart="true"
-         android:layout_alignParentTop="true"
-         android:layout_width="match_parent"
-         android:layout_height="match_parent"
-         android:gravity="top|center_horizontal"
-         android:scaleType="centerCrop"
-         android:contentDescription="@string/contactPhoto" />
-
-    <!-- Used when the phone call is on hold, dimming the primary photo
-
-         Note: Theoretically it is possible to achieve this effect using
-         Drawable#setColorFilter().
-
-         But watch out: we also use cross fade between primary and
-         secondary photo, which may interfere with the dim effect with
-         setColorFilter(). To try it out, use GSM phones and do multiple
-         calls.
-
-         Detail: during the cross-fade effect we are currently using
-         TransitionDrawable. TransitionDrawable#setColorFilter() will call
-         the equivalent method for *both* drawables which are shared by
-         the two ImageViews. If we set setColorFilter() for "on hold" effect
-         during the cross-fade, *both* primary and secondary photos become
-         dim.
-
-         Theoretically it can be avoided (by copying drawable, or carefully
-         calling setColorFilter() conditionally. But it doesn't bang for the
-         buck for now.
-
-         TODO: try that. It may be smoother with slower devices.
-      -->
-    <View android:id="@+id/dim_effect_for_primary_photo"
-         android:layout_alignParentStart="true"
-         android:layout_alignParentTop="true"
-         android:layout_width="match_parent"
-         android:layout_height="match_parent"
-         android:background="@color/on_hold_dim_effect"
-         android:visibility="gone" />
-
-    <!-- "Call Banner" for primary call, the foregound or ringing call.
-         The "call banner" is a block of info about a single call,
-         including the contact name, phone number, call time counter,
-         and other status info.  This info is shown as a "banner"
-         overlaid across the top of contact photo. -->
-    <RelativeLayout android:id="@+id/primary_call_banner"
-        style="@style/PrimaryCallInfoPrimaryCallBanner"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:minHeight="@dimen/call_banner_height"
-        android:paddingStart="@dimen/call_banner_side_padding"
-        android:paddingEnd="@dimen/call_banner_side_padding"
-        android:paddingTop="@dimen/call_banner_top_bottom_padding"
-        android:paddingBottom="@dimen/call_banner_top_bottom_padding"
-        android:background="@color/incall_call_banner_background">
-
-        <!-- Name (or the phone number, if we don't have a name to display). -->
-        <TextView android:id="@+id/name"
-            android:layout_alignParentTop="true"
-            android:layout_alignParentStart="true"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingEnd="@dimen/call_banner_name_number_right_padding"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textColor="@color/incall_call_banner_text_color"
-            android:singleLine="true"
-            android:textAlignment="viewStart"/>
-
-        <!-- Label (like "Mobile" or "Work", if present) and phone number, side by side -->
-        <LinearLayout android:id="@+id/labelAndNumber"
-            android:layout_below="@id/name"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingEnd="@dimen/call_banner_name_number_right_padding"
-            android:orientation="horizontal">
-            <TextView android:id="@+id/phoneNumber"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textColor="@color/incall_call_banner_text_color"
-                android:singleLine="true"
-                android:textDirection="ltr" />
-            <TextView android:id="@+id/label"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textColor="@color/incall_call_banner_text_color"
-                android:textAllCaps="true"
-                android:singleLine="true"
-                android:layout_marginStart="6dp" />
-        </LinearLayout>
-
-        <!-- Elapsed time indication for a call in progress. -->
-        <TextView android:id="@+id/elapsedTime"
-            android:layout_alignParentEnd="true"
-            android:layout_centerVertical="true"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textColor="@color/incall_call_banner_text_color"
-            android:singleLine="true"
-            android:visibility="invisible" />
-
-        <!-- Call type indication: a special label and/or branding
-             for certain kinds of calls (like "Internet call" for a SIP call.) -->
-        <TextView android:id="@+id/callTypeLabel"
-            android:layout_below="@id/labelAndNumber"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="@color/incall_call_banner_text_color"
-            android:maxLines="1"
-            android:ellipsize="end" />
-
-    </RelativeLayout>  <!-- End of call_banner -->
-
-    <LinearLayout android:id="@+id/secondary_info_container"
-        style="@style/PrimaryCallInfoSecondaryInfoContainer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical|right"
-        android:orientation="vertical"
-        android:background="@color/incall_secondary_info_background"
-        android:animateLayoutChanges="true">
-
-        <!-- Shown when a gateway provider is used during any outgoing call. -->
-        <LinearLayout android:id="@+id/providerInfo"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingTop="@dimen/provider_info_top_bottom_padding"
-            android:paddingBottom="@dimen/provider_info_top_bottom_padding"
-            android:paddingStart="@dimen/call_banner_side_padding"
-            android:paddingEnd="@dimen/call_banner_side_padding"
-            android:gravity="end"
-            android:orientation="horizontal"
-            android:background="@android:color/transparent">
-            <TextView android:id="@+id/providerLabel"
-                android:layout_width="0px"
-                android:layout_height="wrap_content"
-                android:layout_weight="6"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textAllCaps="true"
-                android:textColor="@color/incall_call_banner_text_color"
-                android:singleLine="true"
-                android:ellipsize="marquee" />
-            <TextView android:id="@+id/providerAddress"
-                android:layout_width="0px"
-                android:layout_height="wrap_content"
-                android:layout_weight="4"
-                android:gravity="end"
-                android:paddingStart="8dp"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textAllCaps="true"
-                android:textColor="@color/incall_call_banner_text_color"
-                android:singleLine="true"
-                android:ellipsize="middle" />
-        </LinearLayout>
-
-        <!-- The "call state label": In some states, this shows a special
-             indication like "Dialing" or "Incoming call" or "Call ended".
-             It's unused for the normal case of an active ongoing call. -->
-        <TextView android:id="@+id/callStateLabel"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingTop="@dimen/provider_info_top_bottom_padding"
-            android:paddingBottom="@dimen/provider_info_top_bottom_padding"
-            android:paddingStart="@dimen/call_banner_side_padding"
-            android:paddingEnd="@dimen/call_banner_side_padding"
-            android:gravity="end"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="@color/incall_call_banner_text_color"
-            android:textAllCaps="true"
-            android:background="@android:color/transparent"
-            android:singleLine="true"
-            android:ellipsize="end" />
-    </LinearLayout>
-
-    <!-- Social status (currently unused) -->
-    <!-- <TextView android:id="@+id/socialStatus"
-              android:layout_below="@id/callTypeLabel"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:textAppearance="?android:attr/textAppearanceSmall"
-              android:textColor="@color/incall_call_banner_text_color"
-              android:maxLines="2"
-              android:ellipsize="end"
-              /> -->
-</RelativeLayout>
diff --git a/res/layout/secondary_call_info.xml b/res/layout/secondary_call_info.xml
deleted file mode 100644
index b84ba82..0000000
--- a/res/layout/secondary_call_info.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 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 secondary call info, which will be used by CallCard.
-     See also call_card.xml.
-
-     This should look similar to primary call info (primary_call_info.xml), but
-     to optimize the view usage, the structure is different. -->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <!-- Contact photo for call_info #2 -->
-    <ImageView android:id="@+id/secondaryCallPhoto"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="top|center_horizontal"
-        android:scaleType="centerCrop"
-        android:contentDescription="@string/onHold" />
-
-    <!-- Overlaps secondary photo when the secondary call is in HOLD state.
-
-         TODO: We could do better. See equivalent in primary xml. -->
-    <View android:id="@+id/dim_effect_for_secondary_photo"
-         android:layout_width="match_parent"
-         android:layout_height="match_parent"
-         android:background="@drawable/clickable_dim_effect"
-         android:visibility="gone" />
-
-    <!-- Name (or the phone number, if we don't have a name to display). -->
-    <TextView android:id="@+id/secondaryCallName"
-        style="@style/SecondaryCallInfoSecondaryCallName"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/call_banner_height"
-        android:gravity="top|start"
-        android:paddingStart="@dimen/call_banner_side_padding"
-        android:paddingEnd="@dimen/call_banner_side_padding"
-        android:paddingTop="@dimen/call_banner_top_bottom_padding"
-        android:paddingBottom="@dimen/call_banner_top_bottom_padding"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:textColor="@color/incall_call_banner_text_color"
-        android:singleLine="true"
-        android:background="@color/incall_call_banner_background" />
-
-    <!-- Call status of the background call, usually the string "On hold". -->
-    <TextView android:id="@+id/secondaryCallStatus"
-        style="@style/SecondaryCallInfoSecondaryCallStatus"
-        android:layout_width="wrap_content"
-        android:layout_height="@dimen/call_banner_height"
-        android:gravity="top|end"
-        android:paddingStart="@dimen/call_banner_side_padding"
-        android:paddingEnd="@dimen/call_banner_side_padding"
-        android:paddingTop="@dimen/call_banner_top_bottom_padding"
-        android:paddingBottom="@dimen/call_banner_top_bottom_padding"
-        android:text="@string/onHold"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:textColor="@color/incall_call_banner_text_color"
-        android:textAllCaps="true"
-        android:singleLine="true" />
-</FrameLayout>
diff --git a/res/menu/incall_audio_mode_menu.xml b/res/menu/incall_audio_mode_menu.xml
deleted file mode 100644
index 0139895..0000000
--- a/res/menu/incall_audio_mode_menu.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 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.
--->
-
-<!-- "Audio mode" popup menu for the in-call UI. -->
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- TODO: Need final icon assets.  Also, PopupMenu currently ignores the
-         android:icon attribute anyway(!) -->
-    <item android:id="@+id/audio_mode_speaker"
-          android:icon="@drawable/ic_sound_holo_dark"
-          android:title="@string/audio_mode_speaker" />
-
-    <!-- We display *either* "earpiece" or "wired headset", never both,
-         depending on whether a wired headset is physically plugged in
-         (see InCallTouchUi.showAudioModePopup().) -->
-    <item android:id="@+id/audio_mode_earpiece"
-          android:icon="@drawable/ic_ab_dialer_holo_dark"
-          android:title="@string/audio_mode_earpiece" />
-    <item android:id="@+id/audio_mode_wired_headset"
-          android:icon="@drawable/ic_ab_dialer_holo_dark"
-          android:title="@string/audio_mode_wired_headset" />
-
-    <item android:id="@+id/audio_mode_bluetooth"
-          android:icon="@drawable/ic_bluetooth_holo_dark"
-          android:title="@string/audio_mode_bluetooth" />
-</menu>
diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml
deleted file mode 100644
index 9eb531d..0000000
--- a/res/values-land/dimens.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 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.
--->
-<resources>
-    <dimen name="emergency_dialer_digits_height">66dip</dimen>
-
-    <!-- Height of the "call banner" overlay on bottom of the call_card -->
-    <dimen name="call_banner_height">@dimen/in_call_end_button_height</dimen>
-</resources>
diff --git a/res/values-land/styles.xml b/res/values-land/styles.xml
deleted file mode 100644
index 0626a15..0000000
--- a/res/values-land/styles.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 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.
--->
-
-<resources>
-    <style name="PrimaryCallInfoPrimaryCallBanner">
-        <item name="android:layout_alignParentBottom">true</item>
-    </style>
-    <style name="PrimaryCallInfoSecondaryInfoContainer">
-        <item name="android:layout_above">@id/primary_call_banner</item>
-    </style>
-
-    <style name="SecondaryCallInfoSecondaryCallName">
-        <item name="android:layout_gravity">bottom|left</item>
-    </style>
-    <style name="SecondaryCallInfoSecondaryCallStatus">
-        <item name="android:layout_gravity">bottom|right</item>
-    </style>
-</resources>
diff --git a/res/values/array.xml b/res/values/array.xml
index 6ddea47..245c09b 100644
--- a/res/values/array.xml
+++ b/res/values/array.xml
@@ -49,53 +49,4 @@
         <item>@string/sip_always_send_keepalive</item>
     </string-array>
 
-    <!-- "Target" resources for the GlowPadView widget used for incoming calls;
-         see InCallTouchUi.showIncomingCallWidget() and incall_touch_ui.xml.  -->
-
-    <!-- For most incoming calls the GlowPadView widget provides 3 choices:
-         - Answer (drag right)
-         - Reject (drag left)
-         - Respond via SMS (drag up) -->
-    <array name="incoming_call_widget_3way_targets">
-        <item>@drawable/ic_lockscreen_answer</item>
-        <item>@drawable/ic_lockscreen_text</item>
-        <item>@drawable/ic_lockscreen_decline</item>
-        <item>@null</item>"
-    </array>
-    <array name="incoming_call_widget_3way_target_descriptions">
-        <item>@string/description_target_answer</item>
-        <item>@string/description_target_send_sms</item>
-        <item>@string/description_target_decline</item>
-        <item>@null</item>"
-    </array>
-    <array name="incoming_call_widget_3way_direction_descriptions">
-        <item>@*android:string/description_direction_right</item>
-        <item>@*android:string/description_direction_up</item>
-        <item>@*android:string/description_direction_left</item>
-        <item>@null</item>
-    </array>
-
-    <!-- But in some cases "Respond via SMS" isn't available, so there are
-         only 2 choices:
-         - Answer (drag right)
-         - Reject (drag left) -->
-    <array name="incoming_call_widget_2way_targets">
-        <item>@drawable/ic_lockscreen_answer</item>
-        <item>@null</item>
-        <item>@drawable/ic_lockscreen_decline</item>
-        <item>@null</item>"
-    </array>
-    <array name="incoming_call_widget_2way_target_descriptions">
-        <item>@string/description_target_answer</item>
-        <item>@null</item>
-        <item>@string/description_target_decline</item>
-        <item>@null</item>"
-    </array>
-    <array name="incoming_call_widget_2way_direction_descriptions">
-        <item>@*android:string/description_direction_right</item>
-        <item>@null</item>
-        <item>@*android:string/description_direction_left</item>
-        <item>@null</item>
-    </array>
-
 </resources>
diff --git a/res/values/ids.xml b/res/values/ids.xml
deleted file mode 100644
index b004051..0000000
--- a/res/values/ids.xml
+++ /dev/null
@@ -1,27 +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.
--->
-
-<resources>
-    <!-- IDs used with events from in-call touch UI elements.
-         (Note we handle these in the InCallScreen's "button click"
-         handler even though the UI elements may not actually be buttons.) -->
-    <item type="id" name="incomingCallAnswer" />
-    <item type="id" name="incomingCallReject" />
-    <item type="id" name="incomingCallRespondViaSms" />
-
-    <!-- View tag ID used by AnimationUtils.Fade -->
-    <item type="id" name="fadeState" />
-</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index c91f69b..f4f4a31 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -260,20 +260,6 @@
         <item name="android:cursorVisible">false</item>
     </style>
 
-    <style name="PrimaryCallInfoPrimaryCallBanner">
-        <item name="android:layout_alignParentTop">true</item>
-    </style>
-    <style name="PrimaryCallInfoSecondaryInfoContainer">
-        <item name="android:layout_below">@id/primary_call_banner</item>
-    </style>
-
-    <style name="SecondaryCallInfoSecondaryCallName">
-        <item name="android:layout_gravity">top|left</item>
-    </style>
-    <style name="SecondaryCallInfoSecondaryCallStatus">
-        <item name="android:layout_gravity">top|right</item>
-    </style>
-
     <style name="Theme.Transparent" parent="android:Theme">
         <item name="android:windowIsTranslucent">true</item>
         <item name="android:windowBackground">@android:color/transparent</item>