diff options
| author | Andrew Lee <anwlee@google.com> | 2014-05-21 20:46:22 -0700 |
|---|---|---|
| committer | Andrew Lee <anwlee@google.com> | 2014-05-22 12:38:09 -0700 |
| commit | 6af73542e5a50b30cd62214d27d2d4ad88fa4982 (patch) | |
| tree | 270d8de2ff52d4fa4c91be167b4bf45394fd17a6 /InCallUI/res/drawable | |
| parent | d2ac55ad54be300d33d064d8cd03b6b32230629f (diff) | |
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
Diffstat (limited to 'InCallUI/res/drawable')
| -rw-r--r-- | InCallUI/res/drawable/btn_compound_audio.xml | 9 | ||||
| -rw-r--r-- | InCallUI/res/drawable/btn_compound_mute.xml | 10 |
2 files changed, 3 insertions, 16 deletions
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> |