diff options
| author | Yorke Lee <yorkelee@google.com> | 2015-04-01 16:50:26 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-01 16:50:26 +0000 |
| commit | cb8987ab333a5d9693b28e9257de26d878d29480 (patch) | |
| tree | b454f10e0dab8df6286b231f7d2642560f55b8d6 | |
| parent | a1add7a90c7a9d9108820f41c44171a1ecc222e1 (diff) | |
| parent | f778d96f3d8ead00ed1708aa12b7d2702948c95c (diff) | |
am cf2da3d6: Don\'t hide end call button until call is disconnected
* commit 'cf2da3d64ae356a2684a18ffa9be10b3811bc680':
Don't hide end call button until call is disconnected
| -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 cb378a687..396632ca2 100644 --- a/InCallUI/src/com/android/incallui/CallCardPresenter.java +++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java @@ -254,7 +254,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( |