7 files changed, 10 insertions, 87 deletions
diff --git a/InCallUI/res/drawable/btn_compound_audio.xml b/InCallUI/res/drawable/btn_compound_audio.xml
index 5d364942d..c348c98c1 100644
--- a/InCallUI/res/drawable/btn_compound_audio.xml
+++ b/InCallUI/res/drawable/btn_compound_audio.xml
@@ -37,7 +37,7 @@
          (In states where the audio button *not* a toggle, we explicitly
          hide this layer.) -->
     <item android:id="@+id/compoundBackgroundItem"
-          android:drawable="@drawable/btn_fake_compound_background" />
+          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*
diff --git a/InCallUI/res/drawable/btn_compound_background.xml b/InCallUI/res/drawable/btn_compound_background.xml
index 6f2ef5f1d..5af7cca77 100644
--- a/InCallUI/res/drawable/btn_compound_background.xml
+++ b/InCallUI/res/drawable/btn_compound_background.xml
@@ -20,15 +20,14 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item android:state_pressed="true"
-          android:drawable="@drawable/list_pressed_holo_dark" />
-    <item android:state_checked="true" android:state_focused="true"
-          android:drawable="@drawable/list_selector_focused_and_checked" />
+          android:drawable="@color/tab_pressed_color" />
+    <item android:state_selected="true" android:state_focused="true"
+          android:drawable="@drawable/tab_selected_focused" />
     <item android:state_focused="true"
-          android:drawable="@drawable/list_focused_holo" />
-    <item android:state_checked="true"
-          android:drawable="@drawable/ic_active_state_dialer_holo_dark" />
+          android:drawable="@drawable/tab_unselected_focused" />
+    <item android:state_selected="true"
+            android:drawable="@drawable/tab_selected" />
 
-    <item
-        android:drawable="@android:color/transparent" />
+    <item android:drawable="@android:color/transparent" />
 
 </selector>
diff --git a/InCallUI/res/drawable/btn_fake_compound_hold.xml b/InCallUI/res/drawable/btn_compound_hold.xml
index 04bdd9441..50161eac8 100644
--- a/InCallUI/res/drawable/btn_fake_compound_hold.xml
+++ b/InCallUI/res/drawable/btn_compound_hold.xml
@@ -18,7 +18,7 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- The standard "compound button" background. -->
-    <item android:drawable="@drawable/btn_fake_compound_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. -->
diff --git a/InCallUI/res/drawable/btn_fake_compound_mute.xml b/InCallUI/res/drawable/btn_compound_mute.xml
index 69048a27f..4e09bd9c3 100644
--- a/InCallUI/res/drawable/btn_fake_compound_mute.xml
+++ b/InCallUI/res/drawable/btn_compound_mute.xml
@@ -18,7 +18,7 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- The standard "compound button" background. -->
-    <item android:drawable="@drawable/btn_fake_compound_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. -->
diff --git a/InCallUI/res/drawable/btn_fake_compound_background.xml b/InCallUI/res/drawable/btn_fake_compound_background.xml
deleted file mode 100644
index 197f589d1..000000000
--- a/InCallUI/res/drawable/btn_fake_compound_background.xml
+++ /dev/null
@@ -1,36 +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 resource for "compound buttons" in the in-call UI.
-     These buttons have two states (checked and unchecked), and
-     show a blue bar along the bottom edge when checked. -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_pressed="true" android:state_selected="true"
-          android:drawable="@drawable/list_selector_selected_and_pressed" />
-    <item android:state_pressed="true"
-          android:drawable="@drawable/list_pressed_holo_dark" />
-    <item android:state_selected="true" android:state_focused="true"
-          android:drawable="@drawable/list_selector_focused_and_checked" />
-    <item android:state_focused="true"
-          android:drawable="@drawable/list_focused_holo" />
-    <item android:state_selected="true"
-          android:drawable="@drawable/ic_active_state_dialer_holo_dark" />
-
-    <item
-        android:drawable="@android:color/transparent" />
-
-</selector>
-\ No newline at end of file
diff --git a/InCallUI/res/drawable/list_selector_focused_and_checked.xml b/InCallUI/res/drawable/list_selector_focused_and_checked.xml
deleted file mode 100644
index 113dae821..000000000
--- a/InCallUI/res/drawable/list_selector_focused_and_checked.xml
+++ /dev/null
@@ -1,20 +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.
--->
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:drawable="@drawable/ic_active_state_dialer_holo_dark" />
-    <item android:drawable="@drawable/list_focused_holo" />
-</layer-list>
diff --git a/InCallUI/res/drawable/list_selector_selected_and_pressed.xml b/InCallUI/res/drawable/list_selector_selected_and_pressed.xml
deleted file mode 100644
index d81ee36ea..000000000
--- a/InCallUI/res/drawable/list_selector_selected_and_pressed.xml
+++ /dev/null
@@ -1,20 +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.
--->
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:drawable="@drawable/ic_active_state_dialer_holo_dark" />
-    <item android:drawable="@drawable/list_pressed_holo_dark" />
-</layer-list>
-\ No newline at end of file