Remove dual-state icons for call buttons.

Per discussion with design, it'll be simpler to just have one icon
which does not toggle/change on state (besides color accent).

Bug: 15165717
Change-Id: I2856c403b549e734e8f6c55b5be65f9a337730d6

10 files changed, 3 insertions, 16 deletions

diff --git a/InCallUI/res/drawable-hdpi/ic_toolbar_mic_on.png b/InCallUI/res/drawable-hdpi/ic_toolbar_mic_on.png
deleted file mode 100644
index 9a5afbc85..000000000
--- a/InCallUI/res/drawable-hdpi/ic_toolbar_mic_on.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-hdpi/ic_toolbar_speaker_off.png b/InCallUI/res/drawable-hdpi/ic_toolbar_speaker_off.png
deleted file mode 100644
index a73c0dcdf..000000000
--- a/InCallUI/res/drawable-hdpi/ic_toolbar_speaker_off.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-mdpi/ic_toolbar_mic_on.png b/InCallUI/res/drawable-mdpi/ic_toolbar_mic_on.png
deleted file mode 100644
index 0be1d1f14..000000000
--- a/InCallUI/res/drawable-mdpi/ic_toolbar_mic_on.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-mdpi/ic_toolbar_speaker_off.png b/InCallUI/res/drawable-mdpi/ic_toolbar_speaker_off.png
deleted file mode 100644
index 1040ca6da..000000000
--- a/InCallUI/res/drawable-mdpi/ic_toolbar_speaker_off.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-xhdpi/ic_toolbar_mic_on.png b/InCallUI/res/drawable-xhdpi/ic_toolbar_mic_on.png
deleted file mode 100644
index 9ae4b414d..000000000
--- a/InCallUI/res/drawable-xhdpi/ic_toolbar_mic_on.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-xhdpi/ic_toolbar_speaker_off.png b/InCallUI/res/drawable-xhdpi/ic_toolbar_speaker_off.png
deleted file mode 100644
index b332a2025..000000000
--- a/InCallUI/res/drawable-xhdpi/ic_toolbar_speaker_off.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-xxhdpi/ic_toolbar_mic_on.png b/InCallUI/res/drawable-xxhdpi/ic_toolbar_mic_on.png
deleted file mode 100644
index 11b4655ad..000000000
--- a/InCallUI/res/drawable-xxhdpi/ic_toolbar_mic_on.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-xxhdpi/ic_toolbar_speaker_off.png b/InCallUI/res/drawable-xxhdpi/ic_toolbar_speaker_off.png
deleted file mode 100644
index 603a954fe..000000000
--- a/InCallUI/res/drawable-xxhdpi/ic_toolbar_speaker_off.png
+++ /dev/null
diff --git a/InCallUI/res/drawable/btn_compound_audio.xml b/InCallUI/res/drawable/btn_compound_audio.xml
index 9b24d8b6f..adfb8c279 100644
--- a/InCallUI/res/drawable/btn_compound_audio.xml
+++ b/InCallUI/res/drawable/btn_compound_audio.xml
@@ -84,19 +84,12 @@
     </item>
 
     <!-- Speakerphone icon showing 'speaker on' state -->
-    <item android:id="@+id/speakerphoneOnItem">
+    <item android:id="@+id/speakerphoneItem">
         <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_toolbar_speaker_off"
-                android:gravity="center"
-                android:tint="@color/selectable_icon_tint" />
-    </item>
-
     <!-- Generic "audio mode" icon. -->
     <!-- TODO: is this actually needed? -->
     <!--
diff --git a/InCallUI/res/drawable/btn_compound_mute.xml b/InCallUI/res/drawable/btn_compound_mute.xml
index c224dfc28..68a8c9b34 100644
--- a/InCallUI/res/drawable/btn_compound_mute.xml
+++ b/InCallUI/res/drawable/btn_compound_mute.xml
@@ -21,16 +21,10 @@
     <item android:drawable="@drawable/btn_compound_background" />
 
     <!-- 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"
+    <item>
+        <bitmap android:src="@drawable/ic_toolbar_mic_off"
             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>
-
 </layer-list>