diff options
Diffstat (limited to 'InCallUI')
| -rw-r--r-- | InCallUI/src/com/android/incallui/CallButtonPresenter.java | 4 | ||||
| -rw-r--r-- | InCallUI/src/com/android/incallui/InCallActivity.java | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/InCallUI/src/com/android/incallui/CallButtonPresenter.java b/InCallUI/src/com/android/incallui/CallButtonPresenter.java index b2884e625..f14d851a7 100644 --- a/InCallUI/src/com/android/incallui/CallButtonPresenter.java +++ b/InCallUI/src/com/android/incallui/CallButtonPresenter.java @@ -195,13 +195,13 @@ public class CallButtonPresenter extends Presenter<CallButtonPresenter.CallButto } final boolean isVisible = state.isConnectingOrConnected() && - !state.isIncoming(); + !state.isIncoming() && call != null; ui.setVisible(isVisible); Log.d(this, "Updating call UI for call: ", call); - if (isVisible && call != null) { + if (isVisible) { Log.v(this, "Show hold ", call.can(Capabilities.HOLD)); Log.v(this, "Show merge ", call.can(Capabilities.MERGE_CALLS)); Log.v(this, "Show swap ", call.can(Capabilities.SWAP_CALLS)); diff --git a/InCallUI/src/com/android/incallui/InCallActivity.java b/InCallUI/src/com/android/incallui/InCallActivity.java index 38e2a48b6..7d7ca4bad 100644 --- a/InCallUI/src/com/android/incallui/InCallActivity.java +++ b/InCallUI/src/com/android/incallui/InCallActivity.java @@ -273,6 +273,7 @@ public class InCallActivity extends Activity { if (mCallButtonFragment == null) { mCallButtonFragment = (CallButtonFragment) getFragmentManager() .findFragmentById(R.id.callButtonFragment); + mCallButtonFragment.getView().setVisibility(View.INVISIBLE); } if (mCallCardFragment == null) { |