diff options
| author | Yorke Lee <yorkelee@google.com> | 2015-04-23 19:06:23 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-23 19:06:23 +0000 |
| commit | e8ab79a711917a52f22536a8cad37494acc5a6e5 (patch) | |
| tree | c4ccbd1b69f45b62de6c8319487c929280f25302 | |
| parent | 1838e77845e2ba822bc7f510515b50cf00ddc2a4 (diff) | |
| parent | cf2da3d64ae356a2684a18ffa9be10b3811bc680 (diff) | |
| download | InCallUI-lollipop-mr1-wfc-release.tar.gz | |
am cf2da3d6: Don\'t hide end call button until call is disconnectedandroid-5.1.1_r5android-5.1.1_r28android-5.1.1_r22android-5.1.1_r17android-5.1.1_r12lollipop-mr1-wfc-release
* commit 'cf2da3d64ae356a2684a18ffa9be10b3811bc680':
Don't hide end call button until call is disconnected
| -rw-r--r-- | src/com/android/incallui/CallCardPresenter.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/incallui/CallCardPresenter.java b/src/com/android/incallui/CallCardPresenter.java index d8905234..941c64ef 100644 --- a/src/com/android/incallui/CallCardPresenter.java +++ b/src/com/android/incallui/CallCardPresenter.java @@ -259,7 +259,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( |