summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2015-03-30 12:31:19 -0700
committerYorke Lee <yorkelee@google.com>2015-03-30 21:55:43 +0000
commitf778d96f3d8ead00ed1708aa12b7d2702948c95c (patch)
treeb454f10e0dab8df6286b231f7d2642560f55b8d6
parentf5ecda7c3146020fbc3149955db867969d04900b (diff)
Don't hide end call button until call is disconnected
Currently, the end call button is hidden the moment the user initates a hangup. In the event that the call is not actually disconnected, the UI is stuck in a "Hanging up" state that is unresponsive For the majority of calls that disconnect correctly, there should be no user-perceptible difference in behavior. For calls that are not disconnected correctly, the end call button will remain showing so that hangup commands can continue to be sent that will eventually disconnect the call correctly. Bug: 19933863 Change-Id: I2ff2018d7d229615f5f57c599f74954ec7492f6b
-rw-r--r--InCallUI/src/com/android/incallui/CallCardPresenter.java3
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(