From e1c196e04154815e2fb55801af73beb9fb2aa324 Mon Sep 17 00:00:00 2001 From: Qi Wang Date: Mon, 29 Feb 2016 11:45:01 -0800 Subject: Accessibility: announce the active call after switching calls. Bug: 24200862 Change-Id: I102a9c8406984a9dd4cfd8b91ec77254aa984dd5 --- InCallUI/src/com/android/incallui/CallCardPresenter.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'InCallUI/src/com/android/incallui/CallCardPresenter.java') diff --git a/InCallUI/src/com/android/incallui/CallCardPresenter.java b/InCallUI/src/com/android/incallui/CallCardPresenter.java index dd255e09e..bf7b4769b 100644 --- a/InCallUI/src/com/android/incallui/CallCardPresenter.java +++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java @@ -337,7 +337,7 @@ public class CallCardPresenter extends Presenter getUi().setEndCallButtonEnabled(shouldShowEndCallButton(mPrimary, callState), callState != Call.State.INCOMING /* animate */); - maybeSendAccessibilityEvent(oldState, newState); + maybeSendAccessibilityEvent(oldState, newState, primaryChanged); } @Override @@ -1062,7 +1062,8 @@ public class CallCardPresenter extends Presenter return true; } - private void maybeSendAccessibilityEvent(InCallState oldState, InCallState newState) { + private void maybeSendAccessibilityEvent(InCallState oldState, InCallState newState, + boolean primaryChanged) { if (mContext == null) { return; } @@ -1071,8 +1072,11 @@ public class CallCardPresenter extends Presenter if (!am.isEnabled()) { return; } + // Announce the current call if it's new incoming/outgoing call or primary call is changed + // due to switching calls between two ongoing calls (one is on hold). if ((oldState != InCallState.OUTGOING && newState == InCallState.OUTGOING) - || (oldState != InCallState.INCOMING && newState == InCallState.INCOMING)) { + || (oldState != InCallState.INCOMING && newState == InCallState.INCOMING) + || primaryChanged) { if (getUi() != null) { getUi().sendAccessibilityAnnouncement(); } -- cgit v1.2.3