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

Commit 5f5dee23 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update crashed phone app strings." into rvc-dev am: d3045a98 am: c4ea90ee am: 70f06e31 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telecomm/+/11885501

Change-Id: I4f4ee3acdfc7f563fae8ce3d0d34534910c8f167
parents 1365f557 70f06e31

res/values/strings.xml

+6 −5
Original line number Diff line number Diff line
@@ -75,13 +75,14 @@ 
        background. This app may be accessing and playing audio over the call.

    </string>



    <!-- Crashed in call service notification label, used when the in call service has cranshed and

    <!-- Crashed in call service notification label, used when the in call service has crashed and

         the system fall back to use system dialer. [CHAR LIMIT=NONE] -->

    <string name="notification_crashedInCallService_title">Crashed phone app</string>

    <string name="notification_incallservice_not_responding_title">

        <xliff:g id="in_call_service_app_name">%s</xliff:g> stopped responding

    </string>

    <!-- Body of the notification presented when an in call service crashed. [CHAR LIMIT=NONE] -->

    <string name="notification_crashedInCallService_body">

        Your phone app <xliff:g id="in_call_service_app_name">%s</xliff:g> has crashed.

        You call was continued using the phone app that came with your device.

    <string name="notification_incallservice_not_responding_body">

        Your call used the phone app that came with your device

    </string>



    <!-- Content description of the call muted notification icon for

src/com/android/server/telecom/InCallController.java

+4 −5
Original line number Diff line number Diff line
@@ -1830,12 +1830,11 @@ public class InCallController extends CallsManagerListenerBase { 
        builder.setSmallIcon(R.drawable.ic_phone)

                .setColor(mContext.getResources().getColor(R.color.theme_color))

                .setContentTitle(

                        mContext.getText(

                                R.string.notification_crashedInCallService_title))

                        mContext.getString(

                                R.string.notification_incallservice_not_responding_title, appName))

                .setStyle(new Notification.BigTextStyle()

                        .bigText(mContext.getString(

                                R.string.notification_crashedInCallService_body,

                                appName)));

                        .bigText(mContext.getText(

                                R.string.notification_incallservice_not_responding_body)));

        notificationManager.notify(NOTIFICATION_TAG, IN_CALL_SERVICE_NOTIFICATION_ID,

                builder.build());

    }