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

6 files changed, 22 insertions, 16 deletions

diff --git a/InCallUI/res/drawable/btn_add.xml b/InCallUI/res/drawable/btn_add.xml
index 403fc1cb3..515d65b00 100644
--- a/InCallUI/res/drawable/btn_add.xml
+++ b/InCallUI/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/InCallUI/res/drawable/btn_background.xml b/InCallUI/res/drawable/btn_background.xml
index fabcf7c65..b38434d3e 100644
--- a/InCallUI/res/drawable/btn_background.xml
+++ b/InCallUI/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/InCallUI/res/drawable/btn_compound_audio.xml b/InCallUI/res/drawable/btn_compound_audio.xml
index 51dc2c59e..9b24d8b6f 100644
--- a/InCallUI/res/drawable/btn_compound_audio.xml
+++ b/InCallUI/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/InCallUI/res/drawable/btn_compound_dialpad.xml b/InCallUI/res/drawable/btn_compound_dialpad.xml
index 19668af90..fcd9a3c0f 100644
--- a/InCallUI/res/drawable/btn_compound_dialpad.xml
+++ b/InCallUI/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/InCallUI/res/drawable/btn_compound_hold.xml b/InCallUI/res/drawable/btn_compound_hold.xml
index 058db30f4..dcf95073a 100644
--- a/InCallUI/res/drawable/btn_compound_hold.xml
+++ b/InCallUI/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/InCallUI/res/drawable/btn_compound_mute.xml b/InCallUI/res/drawable/btn_compound_mute.xml
index 53608a13c..c224dfc28 100644
--- a/InCallUI/res/drawable/btn_compound_mute.xml
+++ b/InCallUI/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>