commit 99318f2ac8a17fadb0370275564d39eabb90a102
author Anju Mathapati <anjucm@codeaurora.org> Thu Jun 04 17:23:29 2015 +0530
committer Linux Build Service Account <lnxbuild@localhost> Wed Aug 24 08:18:36 2016 -0600
tree 6cb1a73fe08947b1058ab934def368b2d15081f5
parent f1c58d336f1d9ab57133c02b869eb03cbee3fa52

IMS-VT: Update callStateLabel

Update callStateLabel such that it holds both network name
and call specific supplimentary service strings

Change-Id: I56532682cdeeb83eed157481909366c2dbf84319
CRs-Fixed: 848321

InCallUI/res/layout/primary_call_info.xml

diff --git a/InCallUI/res/layout/primary_call_info.xml b/InCallUI/res/layout/primary_call_info.xml
index de9ffc4..1b6e01c 100644
--- a/InCallUI/res/layout/primary_call_info.xml
+++ b/InCallUI/res/layout/primary_call_info.xml
@@ -99,7 +99,6 @@
             android:textColor="@color/incall_accent_color"
             android:textSize="@dimen/call_status_text_size"
             android:alpha="0.7"
-            android:singleLine="true"
             android:gravity="start"
             android:ellipsize="end"
             ex:resizing_text_min_size="@dimen/call_status_text_min_size" />

InCallUI/src/com/android/incallui/CallCardFragment.java

diff --git a/InCallUI/src/com/android/incallui/CallCardFragment.java b/InCallUI/src/com/android/incallui/CallCardFragment.java
index 35b00a0..c64f8c6 100644
--- a/InCallUI/src/com/android/incallui/CallCardFragment.java
+++ b/InCallUI/src/com/android/incallui/CallCardFragment.java
@@ -1167,9 +1167,7 @@
             case Call.State.ACTIVE:
                 // We normally don't show a "call state label" at all in this state
                 // (but we can use the call state label to display the provider name).
-                if ((isAccount || isWifi || isConference) && hasSuggestedLabel) {
-                    callStateLabel = label;
-                } else if (sessionModificationState
+                if (sessionModificationState
                         == Call.SessionModificationState.REQUEST_REJECTED) {
                     callStateLabel = context.getString(R.string.card_title_video_call_rejected);
                     isAutoDismissing = true;
@@ -1186,6 +1184,11 @@
                 } else if (VideoUtils.isVideoCall(videoState)) {
                     callStateLabel = context.getString(R.string.card_title_video_call);
                 }
+
+                if ((isAccount || isWifi || isConference) && hasSuggestedLabel) {
+                   label += (callStateLabel != null) ? (" " + callStateLabel) : "";
+                   callStateLabel = label;
+                }
                 break;
             case Call.State.ONHOLD:
                 callStateLabel = context.getString(R.string.card_title_on_hold);