Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99318f2a authored by Anju Mathapati's avatar Anju Mathapati Committed by Linux Build Service Account
Browse files

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
parent f1c58d33

InCallUI/res/layout/primary_call_info.xml

+0 −1
Original line number Diff line number Diff line
@@ -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

+6 −3
Original line number Diff line number Diff line
@@ -1167,9 +1167,7 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr 
            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 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr 
                } 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);