diff options
| author | Yorke Lee <yorkelee@google.com> | 2015-04-01 17:33:37 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-01 17:33:37 +0000 |
| commit | 98c3b09822844ce61685f794da36c74490a7046c (patch) | |
| tree | 9512b05c7b39f5612697b3068af2f9d150c663ba /InCallUI | |
| parent | 07149bc8df71c26e3eee8a37ee7974ce634e752e (diff) | |
| parent | 478e7b12ae63ad23178602d506b50140dc164140 (diff) | |
am ff538092: am 2f583c60: am cf2da3d6: Don\'t hide end call button until call is disconnected
* commit 'ff538092b15f379019876c6c4440d225eafd18f4':
Don't hide end call button until call is disconnected
Diffstat (limited to 'InCallUI')
| -rw-r--r-- | InCallUI/src/com/android/incallui/CallCardPresenter.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/InCallUI/src/com/android/incallui/CallCardPresenter.java b/InCallUI/src/com/android/incallui/CallCardPresenter.java index 59263270d..9e5c61155 100644 --- a/InCallUI/src/com/android/incallui/CallCardPresenter.java +++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java @@ -255,7 +255,8 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi> maybeShowManageConferenceCallButton(); - final boolean enableEndCallButton = Call.State.isConnectingOrConnected(callState) && + final boolean enableEndCallButton = (Call.State.isConnectingOrConnected(callState) + || callState == Call.State.DISCONNECTING) && callState != Call.State.INCOMING && mPrimary != null; // Hide the end call button instantly if we're receiving an incoming call. getUi().setEndCallButtonEnabled( |