summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTyler Gunn <tgunn@google.com>2016-02-09 23:30:30 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-02-09 23:30:30 +0000
commitb0590651d4af6d27e59d1f2b25b4bca0548dc0bf (patch)
tree3ac9d5238dddffc59bf2713f0081139bb83dd2bb
parent61d9738cab0d2f34750031062ec1e049dd872ec0 (diff)
parent14c3e88a486cb5cfb9ef5fee107118266d305edf (diff)
IMS-VT: Clear progress spinner when primary call changes
am: 2556c5cfb6 * commit '2556c5cfb626045ef4c94f7a994363ee4642c2b9': IMS-VT: Clear progress spinner when primary call changes
-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);
}