From 6af73542e5a50b30cd62214d27d2d4ad88fa4982 Mon Sep 17 00:00:00 2001 From: Andrew Lee Date: Wed, 21 May 2014 20:46:22 -0700 Subject: 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 --- InCallUI/res/drawable-hdpi/ic_toolbar_mic_on.png | Bin 950 -> 0 bytes .../res/drawable-hdpi/ic_toolbar_speaker_off.png | Bin 729 -> 0 bytes InCallUI/res/drawable-mdpi/ic_toolbar_mic_on.png | Bin 748 -> 0 bytes .../res/drawable-mdpi/ic_toolbar_speaker_off.png | Bin 613 -> 0 bytes InCallUI/res/drawable-xhdpi/ic_toolbar_mic_on.png | Bin 1200 -> 0 bytes .../res/drawable-xhdpi/ic_toolbar_speaker_off.png | Bin 839 -> 0 bytes InCallUI/res/drawable-xxhdpi/ic_toolbar_mic_on.png | Bin 1775 -> 0 bytes .../res/drawable-xxhdpi/ic_toolbar_speaker_off.png | Bin 1348 -> 0 bytes InCallUI/res/drawable/btn_compound_audio.xml | 9 +------ InCallUI/res/drawable/btn_compound_mute.xml | 10 ++------ .../com/android/incallui/CallButtonFragment.java | 28 ++++++--------------- 11 files changed, 10 insertions(+), 37 deletions(-) delete mode 100644 InCallUI/res/drawable-hdpi/ic_toolbar_mic_on.png delete mode 100644 InCallUI/res/drawable-hdpi/ic_toolbar_speaker_off.png delete mode 100644 InCallUI/res/drawable-mdpi/ic_toolbar_mic_on.png delete mode 100644 InCallUI/res/drawable-mdpi/ic_toolbar_speaker_off.png delete mode 100644 InCallUI/res/drawable-xhdpi/ic_toolbar_mic_on.png delete mode 100644 InCallUI/res/drawable-xhdpi/ic_toolbar_speaker_off.png delete mode 100644 InCallUI/res/drawable-xxhdpi/ic_toolbar_mic_on.png delete mode 100644 InCallUI/res/drawable-xxhdpi/ic_toolbar_speaker_off.png (limited to 'InCallUI') 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 Binary files a/InCallUI/res/drawable-hdpi/ic_toolbar_mic_on.png and /dev/null differ 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 Binary files a/InCallUI/res/drawable-hdpi/ic_toolbar_speaker_off.png and /dev/null differ 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 Binary files a/InCallUI/res/drawable-mdpi/ic_toolbar_mic_on.png and /dev/null differ 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 Binary files a/InCallUI/res/drawable-mdpi/ic_toolbar_speaker_off.png and /dev/null differ 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 Binary files a/InCallUI/res/drawable-xhdpi/ic_toolbar_mic_on.png and /dev/null differ 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 Binary files a/InCallUI/res/drawable-xhdpi/ic_toolbar_speaker_off.png and /dev/null differ 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 Binary files a/InCallUI/res/drawable-xxhdpi/ic_toolbar_mic_on.png and /dev/null differ 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 Binary files a/InCallUI/res/drawable-xxhdpi/ic_toolbar_speaker_off.png and /dev/null differ 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 @@ - + - - - - - - - + - - - - diff --git a/InCallUI/src/com/android/incallui/CallButtonFragment.java b/InCallUI/src/com/android/incallui/CallButtonFragment.java index d9fc68de3..76055f2c0 100644 --- a/InCallUI/src/com/android/incallui/CallButtonFragment.java +++ b/InCallUI/src/com/android/incallui/CallButtonFragment.java @@ -209,13 +209,6 @@ public class CallButtonFragment @Override public void setMute(boolean value) { - final LayerDrawable layers = (LayerDrawable) mMuteButton.getBackground(); - - layers.findDrawableByLayerId(R.id.muteOffItem) - .setAlpha(value ? HIDDEN : VISIBLE); - layers.findDrawableByLayerId(R.id.muteOnItem) - .setAlpha(value ? VISIBLE : HIDDEN); - mMuteButton.setSelected(value); } @@ -359,8 +352,7 @@ public class CallButtonFragment boolean showMoreIndicator = false; boolean showBluetoothIcon = false; - boolean showSpeakerphoneOnIcon = false; - boolean showSpeakerphoneOffIcon = false; + boolean showSpeakerphoneIcon = false; boolean showHandsetIcon = false; boolean showToggleIndicator = false; @@ -378,7 +370,7 @@ public class CallButtonFragment if (isAudio(AudioMode.BLUETOOTH)) { showBluetoothIcon = true; } else if (isAudio(AudioMode.SPEAKER)) { - showSpeakerphoneOnIcon = true; + showSpeakerphoneIcon = true; } else { showHandsetIcon = true; // TODO: if a wired headset is plugged in, that takes precedence @@ -397,9 +389,7 @@ public class CallButtonFragment // update desired layers: showToggleIndicator = true; - - showSpeakerphoneOnIcon = isAudio(AudioMode.SPEAKER); - showSpeakerphoneOffIcon = !showSpeakerphoneOnIcon; + showSpeakerphoneIcon = true; } else { Log.d(this, "updateAudioButtons - disabled..."); @@ -410,7 +400,7 @@ public class CallButtonFragment // update desired layers: showToggleIndicator = true; - showSpeakerphoneOffIcon = true; + showSpeakerphoneIcon = true; } // Finally, update it all! @@ -419,8 +409,7 @@ public class CallButtonFragment Log.v(this, "audioButtonChecked: " + audioButtonChecked); Log.v(this, "showMoreIndicator: " + showMoreIndicator); Log.v(this, "showBluetoothIcon: " + showBluetoothIcon); - Log.v(this, "showSpeakerphoneOnIcon: " + showSpeakerphoneOnIcon); - Log.v(this, "showSpeakerphoneOffIcon: " + showSpeakerphoneOffIcon); + Log.v(this, "showSpeakerphoneIcon: " + showSpeakerphoneIcon); Log.v(this, "showHandsetIcon: " + showHandsetIcon); // Only enable the audio button if the fragment is enabled. @@ -442,11 +431,8 @@ public class CallButtonFragment layers.findDrawableByLayerId(R.id.handsetItem) .setAlpha(showHandsetIcon ? VISIBLE : HIDDEN); - layers.findDrawableByLayerId(R.id.speakerphoneOnItem) - .setAlpha(showSpeakerphoneOnIcon ? VISIBLE : HIDDEN); - - layers.findDrawableByLayerId(R.id.speakerphoneOffItem) - .setAlpha(showSpeakerphoneOffIcon ? VISIBLE : HIDDEN); + layers.findDrawableByLayerId(R.id.speakerphoneItem) + .setAlpha(showSpeakerphoneIcon ? VISIBLE : HIDDEN); } -- cgit v1.2.3