diff options
author | Andrew Lee <anwlee@google.com> | 2014-05-09 13:40:26 -0700 |
---|---|---|
committer | Andrew Lee <anwlee@google.com> | 2014-05-09 13:48:34 -0700 |
commit | 1caba0126ab1eb55a54ea5d330702a5ccfe3561c (patch) | |
tree | 9fcef82caeaf187d7e161c88aa79e775f1e6a8eb /InCallUI | |
parent | fc53254c2d939fda5dfd4177f9c2441918a7bc86 (diff) |
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
Diffstat (limited to 'InCallUI')
57 files changed, 35 insertions, 21 deletions
diff --git a/InCallUI/res/drawable-hdpi/ic_add_contact_holo_dark.png b/InCallUI/res/drawable-hdpi/ic_add_contact_holo_dark.png Binary files differdeleted file mode 100644 index 88ff33b3d..000000000 --- a/InCallUI/res/drawable-hdpi/ic_add_contact_holo_dark.png +++ /dev/null diff --git a/InCallUI/res/drawable-hdpi/ic_dialpad_holo_dark.png b/InCallUI/res/drawable-hdpi/ic_dialpad_holo_dark.png Binary files differdeleted file mode 100644 index a0ab6c453..000000000 --- a/InCallUI/res/drawable-hdpi/ic_dialpad_holo_dark.png +++ /dev/null diff --git a/InCallUI/res/drawable-hdpi/ic_hold_pause_holo_dark.png b/InCallUI/res/drawable-hdpi/ic_hold_pause_holo_dark.png Binary files differdeleted file mode 100644 index 2b3ff3d3f..000000000 --- a/InCallUI/res/drawable-hdpi/ic_hold_pause_holo_dark.png +++ /dev/null diff --git a/InCallUI/res/drawable-hdpi/ic_mute_holo_dark.png b/InCallUI/res/drawable-hdpi/ic_mute_holo_dark.png Binary files differdeleted file mode 100644 index f17a2daa8..000000000 --- a/InCallUI/res/drawable-hdpi/ic_mute_holo_dark.png +++ /dev/null diff --git a/InCallUI/res/drawable-hdpi/ic_sound_off_speakerphone_holo_dark.png b/InCallUI/res/drawable-hdpi/ic_sound_off_speakerphone_holo_dark.png Binary files differdeleted file mode 100644 index 6f12d52f9..000000000 --- a/InCallUI/res/drawable-hdpi/ic_sound_off_speakerphone_holo_dark.png +++ /dev/null diff --git a/InCallUI/res/drawable-hdpi/ic_sound_speakerphone_holo_dark.png b/InCallUI/res/drawable-hdpi/ic_sound_speakerphone_holo_dark.png Binary files differdeleted file mode 100644 index eadd0cda6..000000000 --- a/InCallUI/res/drawable-hdpi/ic_sound_speakerphone_holo_dark.png +++ /dev/null diff --git a/InCallUI/res/drawable-hdpi/ic_toolbar_add_call.png b/InCallUI/res/drawable-hdpi/ic_toolbar_add_call.png Binary files differnew file mode 100644 index 000000000..f400e568a --- /dev/null +++ b/InCallUI/res/drawable-hdpi/ic_toolbar_add_call.png diff --git a/InCallUI/res/drawable-hdpi/ic_toolbar_dialpad.png b/InCallUI/res/drawable-hdpi/ic_toolbar_dialpad.png Binary files differnew file mode 100644 index 000000000..a29e9b0a6 --- /dev/null +++ b/InCallUI/res/drawable-hdpi/ic_toolbar_dialpad.png diff --git a/InCallUI/res/drawable-hdpi/ic_toolbar_hold.png b/InCallUI/res/drawable-hdpi/ic_toolbar_hold.png Binary files differnew file mode 100644 index 000000000..faf8e0af6 --- /dev/null +++ b/InCallUI/res/drawable-hdpi/ic_toolbar_hold.png diff --git a/InCallUI/res/drawable-hdpi/ic_toolbar_mic_off.png b/InCallUI/res/drawable-hdpi/ic_toolbar_mic_off.png Binary files differnew file mode 100644 index 000000000..0d2c7a2b6 --- /dev/null +++ b/InCallUI/res/drawable-hdpi/ic_toolbar_mic_off.png diff --git a/InCallUI/res/drawable-hdpi/ic_toolbar_mic_on.png b/InCallUI/res/drawable-hdpi/ic_toolbar_mic_on.png Binary files differnew file mode 100644 index 000000000..9a5afbc85 --- /dev/null +++ b/InCallUI/res/drawable-hdpi/ic_toolbar_mic_on.png diff --git a/InCallUI/res/drawable-hdpi/ic_toolbar_speaker_off.png b/InCallUI/res/drawable-hdpi/ic_toolbar_speaker_off.png Binary files differnew file mode 100644 index 000000000..a73c0dcdf --- /dev/null +++ b/InCallUI/res/drawable-hdpi/ic_toolbar_speaker_off.png diff --git a/InCallUI/res/drawable-hdpi/ic_toolbar_speaker_on.png b/InCallUI/res/drawable-hdpi/ic_toolbar_speaker_on.png Binary files differnew file mode 100644 index 000000000..07f33db23 --- /dev/null +++ b/InCallUI/res/drawable-hdpi/ic_toolbar_speaker_on.png diff --git a/InCallUI/res/drawable-ldrtl-hdpi/ic_add_contact_holo_dark.png b/InCallUI/res/drawable-ldrtl-hdpi/ic_add_contact_holo_dark.png Binary files differdeleted file mode 100644 index b6a1381a1..000000000 --- a/InCallUI/res/drawable-ldrtl-hdpi/ic_add_contact_holo_dark.png +++ /dev/null diff --git a/InCallUI/res/drawable-ldrtl-mdpi/ic_add_contact_holo_dark.png b/InCallUI/res/drawable-ldrtl-mdpi/ic_add_contact_holo_dark.png Binary files differdeleted file mode 100644 index 72abb9177..000000000 --- a/InCallUI/res/drawable-ldrtl-mdpi/ic_add_contact_holo_dark.png +++ /dev/null diff --git a/InCallUI/res/drawable-ldrtl-xhdpi/ic_add_contact_holo_dark.png b/InCallUI/res/drawable-ldrtl-xhdpi/ic_add_contact_holo_dark.png Binary files differdeleted file mode 100644 index 60068fd6e..000000000 --- a/InCallUI/res/drawable-ldrtl-xhdpi/ic_add_contact_holo_dark.png +++ /dev/null diff --git a/InCallUI/res/drawable-mdpi/ic_add_contact_holo_dark.png b/InCallUI/res/drawable-mdpi/ic_add_contact_holo_dark.png Binary files differdeleted file mode 100644 index 867f494bc..000000000 --- a/InCallUI/res/drawable-mdpi/ic_add_contact_holo_dark.png +++ /dev/null diff --git a/InCallUI/res/drawable-mdpi/ic_dialpad_holo_dark.png b/InCallUI/res/drawable-mdpi/ic_dialpad_holo_dark.png Binary files differdeleted file mode 100644 index b57fcf344..000000000 --- a/InCallUI/res/drawable-mdpi/ic_dialpad_holo_dark.png +++ /dev/null diff --git a/InCallUI/res/drawable-mdpi/ic_hold_pause_holo_dark.png b/InCallUI/res/drawable-mdpi/ic_hold_pause_holo_dark.png Binary files differdeleted file mode 100644 index 7d550de17..000000000 --- a/InCallUI/res/drawable-mdpi/ic_hold_pause_holo_dark.png +++ /dev/null diff --git a/InCallUI/res/drawable-mdpi/ic_mute_holo_dark.png b/InCallUI/res/drawable-mdpi/ic_mute_holo_dark.png Binary files differdeleted file mode 100644 index 801d1e0ec..000000000 --- a/InCallUI/res/drawable-mdpi/ic_mute_holo_dark.png +++ /dev/null diff --git a/InCallUI/res/drawable-mdpi/ic_toolbar_add_call.png b/InCallUI/res/drawable-mdpi/ic_toolbar_add_call.png Binary files differnew file mode 100644 index 000000000..f493546db --- /dev/null +++ b/InCallUI/res/drawable-mdpi/ic_toolbar_add_call.png diff --git a/InCallUI/res/drawable-mdpi/ic_toolbar_dialpad.png b/InCallUI/res/drawable-mdpi/ic_toolbar_dialpad.png Binary files differnew file mode 100644 index 000000000..38117dd42 --- /dev/null +++ b/InCallUI/res/drawable-mdpi/ic_toolbar_dialpad.png diff --git a/InCallUI/res/drawable-mdpi/ic_toolbar_hold.png b/InCallUI/res/drawable-mdpi/ic_toolbar_hold.png Binary files differnew file mode 100644 index 000000000..9eb88024e --- /dev/null +++ b/InCallUI/res/drawable-mdpi/ic_toolbar_hold.png diff --git a/InCallUI/res/drawable-mdpi/ic_toolbar_mic_off.png b/InCallUI/res/drawable-mdpi/ic_toolbar_mic_off.png Binary files differnew file mode 100644 index 000000000..c67de5621 --- /dev/null +++ b/InCallUI/res/drawable-mdpi/ic_toolbar_mic_off.png diff --git a/InCallUI/res/drawable-mdpi/ic_toolbar_mic_on.png b/InCallUI/res/drawable-mdpi/ic_toolbar_mic_on.png Binary files differnew file mode 100644 index 000000000..0be1d1f14 --- /dev/null +++ b/InCallUI/res/drawable-mdpi/ic_toolbar_mic_on.png diff --git a/InCallUI/res/drawable-mdpi/ic_toolbar_speaker_off.png b/InCallUI/res/drawable-mdpi/ic_toolbar_speaker_off.png Binary files differnew file mode 100644 index 000000000..1040ca6da --- /dev/null +++ b/InCallUI/res/drawable-mdpi/ic_toolbar_speaker_off.png diff --git a/InCallUI/res/drawable-mdpi/ic_toolbar_speaker_on.png b/InCallUI/res/drawable-mdpi/ic_toolbar_speaker_on.png Binary files differnew file mode 100644 index 000000000..cad91db2e --- /dev/null +++ b/InCallUI/res/drawable-mdpi/ic_toolbar_speaker_on.png diff --git a/InCallUI/res/drawable-xhdpi/ic_add_contact_holo_dark.png b/InCallUI/res/drawable-xhdpi/ic_add_contact_holo_dark.png Binary files differdeleted file mode 100644 index 729888234..000000000 --- a/InCallUI/res/drawable-xhdpi/ic_add_contact_holo_dark.png +++ /dev/null diff --git a/InCallUI/res/drawable-xhdpi/ic_dialpad_holo_dark.png b/InCallUI/res/drawable-xhdpi/ic_dialpad_holo_dark.png Binary files differdeleted file mode 100644 index f9a002c79..000000000 --- a/InCallUI/res/drawable-xhdpi/ic_dialpad_holo_dark.png +++ /dev/null diff --git a/InCallUI/res/drawable-xhdpi/ic_hold_pause_holo_dark.png b/InCallUI/res/drawable-xhdpi/ic_hold_pause_holo_dark.png Binary files differdeleted file mode 100644 index d2966755d..000000000 --- a/InCallUI/res/drawable-xhdpi/ic_hold_pause_holo_dark.png +++ /dev/null diff --git a/InCallUI/res/drawable-xhdpi/ic_mute_holo_dark.png b/InCallUI/res/drawable-xhdpi/ic_mute_holo_dark.png Binary files differdeleted file mode 100644 index a882a760f..000000000 --- a/InCallUI/res/drawable-xhdpi/ic_mute_holo_dark.png +++ /dev/null diff --git a/InCallUI/res/drawable-xhdpi/ic_toolbar_add_call.png b/InCallUI/res/drawable-xhdpi/ic_toolbar_add_call.png Binary files differnew file mode 100644 index 000000000..ac80167a0 --- /dev/null +++ b/InCallUI/res/drawable-xhdpi/ic_toolbar_add_call.png diff --git a/InCallUI/res/drawable-xhdpi/ic_toolbar_dialpad.png b/InCallUI/res/drawable-xhdpi/ic_toolbar_dialpad.png Binary files differnew file mode 100644 index 000000000..ef7ca1389 --- /dev/null +++ b/InCallUI/res/drawable-xhdpi/ic_toolbar_dialpad.png diff --git a/InCallUI/res/drawable-xhdpi/ic_toolbar_hold.png b/InCallUI/res/drawable-xhdpi/ic_toolbar_hold.png Binary files differnew file mode 100644 index 000000000..d2faaaeb4 --- /dev/null +++ b/InCallUI/res/drawable-xhdpi/ic_toolbar_hold.png diff --git a/InCallUI/res/drawable-xhdpi/ic_toolbar_mic_off.png b/InCallUI/res/drawable-xhdpi/ic_toolbar_mic_off.png Binary files differnew file mode 100644 index 000000000..3c2c2bb22 --- /dev/null +++ b/InCallUI/res/drawable-xhdpi/ic_toolbar_mic_off.png diff --git a/InCallUI/res/drawable-xhdpi/ic_toolbar_mic_on.png b/InCallUI/res/drawable-xhdpi/ic_toolbar_mic_on.png Binary files differnew file mode 100644 index 000000000..9ae4b414d --- /dev/null +++ b/InCallUI/res/drawable-xhdpi/ic_toolbar_mic_on.png diff --git a/InCallUI/res/drawable-xhdpi/ic_toolbar_speaker_off.png b/InCallUI/res/drawable-xhdpi/ic_toolbar_speaker_off.png Binary files differnew file mode 100644 index 000000000..b332a2025 --- /dev/null +++ b/InCallUI/res/drawable-xhdpi/ic_toolbar_speaker_off.png diff --git a/InCallUI/res/drawable-xhdpi/ic_toolbar_speaker_on.png b/InCallUI/res/drawable-xhdpi/ic_toolbar_speaker_on.png Binary files differnew file mode 100644 index 000000000..ba616420b --- /dev/null +++ b/InCallUI/res/drawable-xhdpi/ic_toolbar_speaker_on.png diff --git a/InCallUI/res/drawable-xxhdpi/ic_add_contact_holo_dark.png b/InCallUI/res/drawable-xxhdpi/ic_add_contact_holo_dark.png Binary files differdeleted file mode 100644 index 6eed276d8..000000000 --- a/InCallUI/res/drawable-xxhdpi/ic_add_contact_holo_dark.png +++ /dev/null diff --git a/InCallUI/res/drawable-xxhdpi/ic_dialpad_holo_dark.png b/InCallUI/res/drawable-xxhdpi/ic_dialpad_holo_dark.png Binary files differdeleted file mode 100644 index c8ce94bb7..000000000 --- a/InCallUI/res/drawable-xxhdpi/ic_dialpad_holo_dark.png +++ /dev/null diff --git a/InCallUI/res/drawable-xxhdpi/ic_hold_pause_holo_dark.png b/InCallUI/res/drawable-xxhdpi/ic_hold_pause_holo_dark.png Binary files differdeleted file mode 100644 index e38bea11e..000000000 --- a/InCallUI/res/drawable-xxhdpi/ic_hold_pause_holo_dark.png +++ /dev/null diff --git a/InCallUI/res/drawable-xxhdpi/ic_mute_holo_dark.png b/InCallUI/res/drawable-xxhdpi/ic_mute_holo_dark.png Binary files differdeleted file mode 100644 index 678b7fbb8..000000000 --- a/InCallUI/res/drawable-xxhdpi/ic_mute_holo_dark.png +++ /dev/null diff --git a/InCallUI/res/drawable-xxhdpi/ic_toolbar_add_call.png b/InCallUI/res/drawable-xxhdpi/ic_toolbar_add_call.png Binary files differnew file mode 100644 index 000000000..3c1ef2c44 --- /dev/null +++ b/InCallUI/res/drawable-xxhdpi/ic_toolbar_add_call.png diff --git a/InCallUI/res/drawable-xxhdpi/ic_toolbar_dialpad.png b/InCallUI/res/drawable-xxhdpi/ic_toolbar_dialpad.png Binary files differnew file mode 100644 index 000000000..7633b5d0b --- /dev/null +++ b/InCallUI/res/drawable-xxhdpi/ic_toolbar_dialpad.png diff --git a/InCallUI/res/drawable-xxhdpi/ic_toolbar_hold.png b/InCallUI/res/drawable-xxhdpi/ic_toolbar_hold.png Binary files differnew file mode 100644 index 000000000..f2b57933b --- /dev/null +++ b/InCallUI/res/drawable-xxhdpi/ic_toolbar_hold.png diff --git a/InCallUI/res/drawable-xxhdpi/ic_toolbar_mic_off.png b/InCallUI/res/drawable-xxhdpi/ic_toolbar_mic_off.png Binary files differnew file mode 100644 index 000000000..77be26888 --- /dev/null +++ b/InCallUI/res/drawable-xxhdpi/ic_toolbar_mic_off.png diff --git a/InCallUI/res/drawable-xxhdpi/ic_toolbar_mic_on.png b/InCallUI/res/drawable-xxhdpi/ic_toolbar_mic_on.png Binary files differnew file mode 100644 index 000000000..11b4655ad --- /dev/null +++ b/InCallUI/res/drawable-xxhdpi/ic_toolbar_mic_on.png diff --git a/InCallUI/res/drawable-xxhdpi/ic_toolbar_speaker_off.png b/InCallUI/res/drawable-xxhdpi/ic_toolbar_speaker_off.png Binary files differnew file mode 100644 index 000000000..603a954fe --- /dev/null +++ b/InCallUI/res/drawable-xxhdpi/ic_toolbar_speaker_off.png diff --git a/InCallUI/res/drawable-xxhdpi/ic_toolbar_speaker_on.png b/InCallUI/res/drawable-xxhdpi/ic_toolbar_speaker_on.png Binary files differnew file mode 100644 index 000000000..ed5c8b16e --- /dev/null +++ b/InCallUI/res/drawable-xxhdpi/ic_toolbar_speaker_on.png 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> diff --git a/InCallUI/src/com/android/incallui/CallButtonFragment.java b/InCallUI/src/com/android/incallui/CallButtonFragment.java index aa2dca784..f2146a60e 100644 --- a/InCallUI/src/com/android/incallui/CallButtonFragment.java +++ b/InCallUI/src/com/android/incallui/CallButtonFragment.java @@ -57,6 +57,10 @@ public class CallButtonFragment private View mManageConferenceButton; private View mGenericMergeButton; + // Constants for Drawable.setAlpha() + private static final int HIDDEN = 0; + private static final int VISIBLE = 255; + @Override CallButtonPresenter createPresenter() { // TODO: find a cleaner way to include audio mode provider than @@ -202,6 +206,13 @@ 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); } @@ -409,10 +420,6 @@ public class CallButtonFragment Log.v(this, "showSpeakerphoneOffIcon: " + showSpeakerphoneOffIcon); Log.v(this, "showHandsetIcon: " + showHandsetIcon); - // Constants for Drawable.setAlpha() - final int HIDDEN = 0; - final int VISIBLE = 255; - mAudioButton.setEnabled(audioButtonEnabled); mAudioButton.setSelected(audioButtonChecked); @@ -436,6 +443,7 @@ public class CallButtonFragment layers.findDrawableByLayerId(R.id.speakerphoneOffItem) .setAlpha(showSpeakerphoneOffIcon ? VISIBLE : HIDDEN); + } private void showAudioModePopup() { diff --git a/InCallUI/src/com/android/incallui/CallButtonPresenter.java b/InCallUI/src/com/android/incallui/CallButtonPresenter.java index 129c68cb9..dc5eda1c3 100644 --- a/InCallUI/src/com/android/incallui/CallButtonPresenter.java +++ b/InCallUI/src/com/android/incallui/CallButtonPresenter.java @@ -138,7 +138,7 @@ public class CallButtonPresenter extends Presenter<CallButtonPresenter.CallButto @Override public void onMute(boolean muted) { - if (getUi() != null) { + if (getUi() != null && !mAutomaticallyMuted) { getUi().setMute(muted); } } |