summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTyler Gunn <tgunn@google.com>2016-02-09 14:40:30 -0800
committerTyler Gunn <tgunn@google.com>2016-02-09 14:40:30 -0800
commit14c3e88a486cb5cfb9ef5fee107118266d305edf (patch)
tree6cdafd60cb7f0486f07d2564afbee54ef6c0c17f
parent5e545d75cc86634846fa9ee3b5db55ac7e1cd347 (diff)
IMS-VT: Clear progress spinner when primary call changes
This is a cherry-pick of partner CL in mm-wireless-dev. In use-cases wherein UE receives waiting call or user tries to add call soon after initiating a modify request, progress spinner is not hidden. Fix this by clearing the progress spinner when primary call changes. Change-Id: I3a5b28e36af3c73e797924cdf1b3cb87815296f1
-rw-r--r--InCallUI/src/com/android/incallui/CallCardPresenter.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/InCallUI/src/com/android/incallui/CallCardPresenter.java b/InCallUI/src/com/android/incallui/CallCardPresenter.java
index ea39aa646..7749118de 100644
--- a/InCallUI/src/com/android/incallui/CallCardPresenter.java
+++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java
@@ -267,6 +267,9 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi>
ui.isCallSubjectVisible() != shouldShowCallSubject) {
// primary call has changed
if (previousPrimary != null) {
+ //clear progess spinner (if any) related to previous primary call
+ maybeShowProgressSpinner(previousPrimary.getState(),
+ Call.SessionModificationState.NO_REQUEST);
CallList.getInstance().removeCallUpdateListener(previousPrimary.getId(), this);
}
CallList.getInstance().addCallUpdateListener(mPrimary.getId(), this);
@@ -279,6 +282,9 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi>
}
if (previousPrimary != null && mPrimary == null) {
+ //clear progess spinner (if any) related to previous primary call
+ maybeShowProgressSpinner(previousPrimary.getState(),
+ Call.SessionModificationState.NO_REQUEST);
CallList.getInstance().removeCallUpdateListener(previousPrimary.getId(), this);
}