Change toolbar icons in the InCallUI.

Also, some slight fixes on the "add call" button so that it's ripple
is properly constrained to the circle, and so that the mute button
is not toggled when mute has automatically been invoked.

Bug: 14108639
Change-Id: I1a23111a212a1f7f86ffde734b195f0bd9350741

55 files changed, 22 insertions, 16 deletions

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 88ff33b3..00000000
--- a/res/drawable-hdpi/ic_add_contact_holo_dark.png
+++ /dev/null
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 a0ab6c45..00000000
--- a/res/drawable-hdpi/ic_dialpad_holo_dark.png
+++ /dev/null
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 2b3ff3d3..00000000
--- a/res/drawable-hdpi/ic_hold_pause_holo_dark.png
+++ /dev/null
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 f17a2daa..00000000
--- a/res/drawable-hdpi/ic_mute_holo_dark.png
+++ /dev/null
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 6f12d52f..00000000
--- a/res/drawable-hdpi/ic_sound_off_speakerphone_holo_dark.png
+++ /dev/null
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 eadd0cda..00000000
--- a/res/drawable-hdpi/ic_sound_speakerphone_holo_dark.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_toolbar_add_call.png b/res/drawable-hdpi/ic_toolbar_add_call.png
new file mode 100644
index 00000000..f400e568
--- /dev/null
+++ b/res/drawable-hdpi/ic_toolbar_add_call.png
diff --git a/res/drawable-hdpi/ic_toolbar_dialpad.png b/res/drawable-hdpi/ic_toolbar_dialpad.png
new file mode 100644
index 00000000..a29e9b0a
--- /dev/null
+++ b/res/drawable-hdpi/ic_toolbar_dialpad.png
diff --git a/res/drawable-hdpi/ic_toolbar_hold.png b/res/drawable-hdpi/ic_toolbar_hold.png
new file mode 100644
index 00000000..faf8e0af
--- /dev/null
+++ b/res/drawable-hdpi/ic_toolbar_hold.png
diff --git a/res/drawable-hdpi/ic_toolbar_mic_off.png b/res/drawable-hdpi/ic_toolbar_mic_off.png
new file mode 100644
index 00000000..0d2c7a2b
--- /dev/null
+++ b/res/drawable-hdpi/ic_toolbar_mic_off.png
diff --git a/res/drawable-hdpi/ic_toolbar_mic_on.png b/res/drawable-hdpi/ic_toolbar_mic_on.png
new file mode 100644
index 00000000..9a5afbc8
--- /dev/null
+++ b/res/drawable-hdpi/ic_toolbar_mic_on.png
diff --git a/res/drawable-hdpi/ic_toolbar_speaker_off.png b/res/drawable-hdpi/ic_toolbar_speaker_off.png
new file mode 100644
index 00000000..a73c0dcd
--- /dev/null
+++ b/res/drawable-hdpi/ic_toolbar_speaker_off.png
diff --git a/res/drawable-hdpi/ic_toolbar_speaker_on.png b/res/drawable-hdpi/ic_toolbar_speaker_on.png
new file mode 100644
index 00000000..07f33db2
--- /dev/null
+++ b/res/drawable-hdpi/ic_toolbar_speaker_on.png
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 b6a1381a..00000000
--- a/res/drawable-ldrtl-hdpi/ic_add_contact_holo_dark.png
+++ /dev/null
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 72abb917..00000000
--- a/res/drawable-ldrtl-mdpi/ic_add_contact_holo_dark.png
+++ /dev/null
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 60068fd6..00000000
--- a/res/drawable-ldrtl-xhdpi/ic_add_contact_holo_dark.png
+++ /dev/null
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 867f494b..00000000
--- a/res/drawable-mdpi/ic_add_contact_holo_dark.png
+++ /dev/null
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 b57fcf34..00000000
--- a/res/drawable-mdpi/ic_dialpad_holo_dark.png
+++ /dev/null
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 7d550de1..00000000
--- a/res/drawable-mdpi/ic_hold_pause_holo_dark.png
+++ /dev/null
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 801d1e0e..00000000
--- a/res/drawable-mdpi/ic_mute_holo_dark.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_toolbar_add_call.png b/res/drawable-mdpi/ic_toolbar_add_call.png
new file mode 100644
index 00000000..f493546d
--- /dev/null
+++ b/res/drawable-mdpi/ic_toolbar_add_call.png
diff --git a/res/drawable-mdpi/ic_toolbar_dialpad.png b/res/drawable-mdpi/ic_toolbar_dialpad.png
new file mode 100644
index 00000000..38117dd4
--- /dev/null
+++ b/res/drawable-mdpi/ic_toolbar_dialpad.png
diff --git a/res/drawable-mdpi/ic_toolbar_hold.png b/res/drawable-mdpi/ic_toolbar_hold.png
new file mode 100644
index 00000000..9eb88024
--- /dev/null
+++ b/res/drawable-mdpi/ic_toolbar_hold.png
diff --git a/res/drawable-mdpi/ic_toolbar_mic_off.png b/res/drawable-mdpi/ic_toolbar_mic_off.png
new file mode 100644
index 00000000..c67de562
--- /dev/null
+++ b/res/drawable-mdpi/ic_toolbar_mic_off.png
diff --git a/res/drawable-mdpi/ic_toolbar_mic_on.png b/res/drawable-mdpi/ic_toolbar_mic_on.png
new file mode 100644
index 00000000..0be1d1f1
--- /dev/null
+++ b/res/drawable-mdpi/ic_toolbar_mic_on.png
diff --git a/res/drawable-mdpi/ic_toolbar_speaker_off.png b/res/drawable-mdpi/ic_toolbar_speaker_off.png
new file mode 100644
index 00000000..1040ca6d
--- /dev/null
+++ b/res/drawable-mdpi/ic_toolbar_speaker_off.png
diff --git a/res/drawable-mdpi/ic_toolbar_speaker_on.png b/res/drawable-mdpi/ic_toolbar_speaker_on.png
new file mode 100644
index 00000000..cad91db2
--- /dev/null
+++ b/res/drawable-mdpi/ic_toolbar_speaker_on.png
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 72988823..00000000
--- a/res/drawable-xhdpi/ic_add_contact_holo_dark.png
+++ /dev/null
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 f9a002c7..00000000
--- a/res/drawable-xhdpi/ic_dialpad_holo_dark.png
+++ /dev/null
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 d2966755..00000000
--- a/res/drawable-xhdpi/ic_hold_pause_holo_dark.png
+++ /dev/null
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 a882a760..00000000
--- a/res/drawable-xhdpi/ic_mute_holo_dark.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_toolbar_add_call.png b/res/drawable-xhdpi/ic_toolbar_add_call.png
new file mode 100644
index 00000000..ac80167a
--- /dev/null
+++ b/res/drawable-xhdpi/ic_toolbar_add_call.png
diff --git a/res/drawable-xhdpi/ic_toolbar_dialpad.png b/res/drawable-xhdpi/ic_toolbar_dialpad.png
new file mode 100644
index 00000000..ef7ca138
--- /dev/null
+++ b/res/drawable-xhdpi/ic_toolbar_dialpad.png
diff --git a/res/drawable-xhdpi/ic_toolbar_hold.png b/res/drawable-xhdpi/ic_toolbar_hold.png
new file mode 100644
index 00000000..d2faaaeb
--- /dev/null
+++ b/res/drawable-xhdpi/ic_toolbar_hold.png
diff --git a/res/drawable-xhdpi/ic_toolbar_mic_off.png b/res/drawable-xhdpi/ic_toolbar_mic_off.png
new file mode 100644
index 00000000..3c2c2bb2
--- /dev/null
+++ b/res/drawable-xhdpi/ic_toolbar_mic_off.png
diff --git a/res/drawable-xhdpi/ic_toolbar_mic_on.png b/res/drawable-xhdpi/ic_toolbar_mic_on.png
new file mode 100644
index 00000000..9ae4b414
--- /dev/null
+++ b/res/drawable-xhdpi/ic_toolbar_mic_on.png
diff --git a/res/drawable-xhdpi/ic_toolbar_speaker_off.png b/res/drawable-xhdpi/ic_toolbar_speaker_off.png
new file mode 100644
index 00000000..b332a202
--- /dev/null
+++ b/res/drawable-xhdpi/ic_toolbar_speaker_off.png
diff --git a/res/drawable-xhdpi/ic_toolbar_speaker_on.png b/res/drawable-xhdpi/ic_toolbar_speaker_on.png
new file mode 100644
index 00000000..ba616420
--- /dev/null
+++ b/res/drawable-xhdpi/ic_toolbar_speaker_on.png
diff --git a/res/drawable-xxhdpi/ic_add_contact_holo_dark.png b/res/drawable-xxhdpi/ic_add_contact_holo_dark.png
deleted file mode 100644
index 6eed276d..00000000
--- a/res/drawable-xxhdpi/ic_add_contact_holo_dark.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_dialpad_holo_dark.png b/res/drawable-xxhdpi/ic_dialpad_holo_dark.png
deleted file mode 100644
index c8ce94bb..00000000
--- a/res/drawable-xxhdpi/ic_dialpad_holo_dark.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_hold_pause_holo_dark.png b/res/drawable-xxhdpi/ic_hold_pause_holo_dark.png
deleted file mode 100644
index e38bea11..00000000
--- a/res/drawable-xxhdpi/ic_hold_pause_holo_dark.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_mute_holo_dark.png b/res/drawable-xxhdpi/ic_mute_holo_dark.png
deleted file mode 100644
index 678b7fbb..00000000
--- a/res/drawable-xxhdpi/ic_mute_holo_dark.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_toolbar_add_call.png b/res/drawable-xxhdpi/ic_toolbar_add_call.png
new file mode 100644
index 00000000..3c1ef2c4
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_toolbar_add_call.png
diff --git a/res/drawable-xxhdpi/ic_toolbar_dialpad.png b/res/drawable-xxhdpi/ic_toolbar_dialpad.png
new file mode 100644
index 00000000..7633b5d0
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_toolbar_dialpad.png
diff --git a/res/drawable-xxhdpi/ic_toolbar_hold.png b/res/drawable-xxhdpi/ic_toolbar_hold.png
new file mode 100644
index 00000000..f2b57933
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_toolbar_hold.png
diff --git a/res/drawable-xxhdpi/ic_toolbar_mic_off.png b/res/drawable-xxhdpi/ic_toolbar_mic_off.png
new file mode 100644
index 00000000..77be2688
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_toolbar_mic_off.png
diff --git a/res/drawable-xxhdpi/ic_toolbar_mic_on.png b/res/drawable-xxhdpi/ic_toolbar_mic_on.png
new file mode 100644
index 00000000..11b4655a
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_toolbar_mic_on.png
diff --git a/res/drawable-xxhdpi/ic_toolbar_speaker_off.png b/res/drawable-xxhdpi/ic_toolbar_speaker_off.png
new file mode 100644
index 00000000..603a954f
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_toolbar_speaker_off.png
diff --git a/res/drawable-xxhdpi/ic_toolbar_speaker_on.png b/res/drawable-xxhdpi/ic_toolbar_speaker_on.png
new file mode 100644
index 00000000..ed5c8b16
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_toolbar_speaker_on.png
diff --git a/res/drawable/btn_add.xml b/res/drawable/btn_add.xml
index 403fc1cb..515d65b0 100644
--- a/res/drawable/btn_add.xml
+++ b/res/drawable/btn_add.xml
@@ -21,7 +21,7 @@
     <item android:drawable="@drawable/btn_background" />
 
     <item>
-        <bitmap android:src="@drawable/ic_add_contact_holo_dark"
+        <bitmap android:src="@drawable/ic_toolbar_add_call"
             android:gravity="center"
             android:tint="@color/selectable_icon_tint" />
     </item>
diff --git a/res/drawable/btn_background.xml b/res/drawable/btn_background.xml
index fabcf7c6..b38434d3 100644
--- a/res/drawable/btn_background.xml
+++ b/res/drawable/btn_background.xml
@@ -21,12 +21,14 @@
 <touch-feedback xmlns:android="http://schemas.android.com/apk/res/android"
     android:tint="@color/tab_pressed_color"
     android:pinned="true">
-    <selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-        <item android:state_focused="true"
-              android:drawable="@drawable/btn_unselected_focused" />
+            <item android:state_focused="true"
+                  android:drawable="@drawable/btn_unselected_focused" />
 
-        <item android:drawable="@drawable/btn_unselected" />
+            <item android:drawable="@drawable/btn_unselected" />
 
-    </selector>
+        </selector>
+    </item>
 </touch-feedback>
\ No newline at end of file
diff --git a/res/drawable/btn_compound_audio.xml b/res/drawable/btn_compound_audio.xml
index 51dc2c59..9b24d8b6 100644
--- a/res/drawable/btn_compound_audio.xml
+++ b/res/drawable/btn_compound_audio.xml
@@ -85,20 +85,19 @@
 
     <!-- Speakerphone icon showing 'speaker on' state -->
     <item android:id="@+id/speakerphoneOnItem">
-        <bitmap android:src="@drawable/ic_sound_speakerphone_holo_dark"
+        <bitmap android:src="@drawable/ic_toolbar_speaker_on"
                 android:gravity="center"
                 android:tint="@color/selectable_icon_tint" />
     </item>
 
     <!-- Speakerphone icon showing 'speaker off' state -->
     <item android:id="@+id/speakerphoneOffItem">
-        <bitmap android:src="@drawable/ic_sound_off_speakerphone_holo_dark"
+        <bitmap android:src="@drawable/ic_toolbar_speaker_off"
                 android:gravity="center"
                 android:tint="@color/selectable_icon_tint" />
     </item>
 
-    <!-- Generic "audio mode" icon.  Looks almost identical to
-         ic_sound_speakerphone_holo_dark.png -->
+    <!-- Generic "audio mode" icon. -->
     <!-- TODO: is this actually needed? -->
     <!--
         <item android:id="@+id/soundItem">
diff --git a/res/drawable/btn_compound_dialpad.xml b/res/drawable/btn_compound_dialpad.xml
index 19668af9..fcd9a3c0 100644
--- a/res/drawable/btn_compound_dialpad.xml
+++ b/res/drawable/btn_compound_dialpad.xml
@@ -23,7 +23,7 @@
     <!-- ...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"
+        <bitmap android:src="@drawable/ic_toolbar_dialpad"
                 android:gravity="center"
                 android:tint="@color/selectable_icon_tint" />
     </item>
diff --git a/res/drawable/btn_compound_hold.xml b/res/drawable/btn_compound_hold.xml
index 058db30f..dcf95073 100644
--- a/res/drawable/btn_compound_hold.xml
+++ b/res/drawable/btn_compound_hold.xml
@@ -23,7 +23,7 @@
     <!-- ...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"
+        <bitmap android:src="@drawable/ic_toolbar_hold"
                 android:gravity="center"
                 android:tint="@color/selectable_icon_tint" />
     </item>
diff --git a/res/drawable/btn_compound_mute.xml b/res/drawable/btn_compound_mute.xml
index 53608a13..c224dfc2 100644
--- a/res/drawable/btn_compound_mute.xml
+++ b/res/drawable/btn_compound_mute.xml
@@ -20,10 +20,15 @@
     <!-- 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"
+    <!-- Use an explicit <bitmap> to avoid scaling the icon up to the full size of the button. -->
+    <item android:id="@+id/muteOffItem">
+        <bitmap android:src="@drawable/ic_toolbar_mic_on"
+            android:gravity="center"
+            android:tint="@color/selectable_icon_tint" />
+    </item>
+
+    <item android:id="@+id/muteOnItem">
+        <bitmap android:src="@drawable/ic_toolbar_mic_off"
                 android:gravity="center"
                 android:tint="@color/selectable_icon_tint" />
     </item>