diff options
| author | Yorke Lee <yorkelee@google.com> | 2015-03-30 12:31:19 -0700 |
|---|---|---|
| committer | The Android Automerger <android-build@google.com> | 2015-04-01 10:52:09 -0700 |
| commit | cd0aa4f07391da437b433d6971eec6c0cb8392aa (patch) | |
| tree | 325dfcd582146cc3cc8a1423e1a5359591f62f0c | |
| parent | d27ad14ef320762f4303b0794d2ae0f339f76d2d (diff) | |
| download | InCallUI-android-cts-5.1_r26.tar.gz | |
Don't hide end call button until call is disconnectedandroid-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-5.1.1_r9android-5.1.1_r6android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r10android-5.1.1_r1lollipop-mr1-releaselollipop-mr1-cts-release
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-- | 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 cb378a68..396632ca 100644 --- a/src/com/android/incallui/CallCardPresenter.java +++ b/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( |