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

Commit 156a9390 authored by Hai Zhang's avatar Hai Zhang Committed by Android (Google) Code Review
Browse files

Merge "Rename the Proxy calling role to Call redirection."

parents 3b79dc5d 9ab7b903

res/values/strings.xml

+3 −3
Original line number Diff line number Diff line
@@ -520,11 +520,11 @@ 
    <string name="role_label_gallery">Gallery app</string>

    <!-- Label for the automotive dialer role. [CHAR LIMIT=30] -->

    <string name="role_label_car_mode_dialer">Car mode phone app</string>

    <!-- Label for the proxy calling app role. [CHAR LIMIT=30] -->

    <string name="role_label_proxy_calling">Call redirecting app</string>

    <!-- Label for the call redirection role. [CHAR LIMIT=30] -->

    <string name="role_label_call_redirection">Call redirecting app</string>

    <!-- Label for the call screening role. [CHAR LIMIT=30] -->

    <string name="role_label_call_screening">Call screening app</string>

    <!-- Label for the call companion app role. [CHAR LIMIT=30] -->

    <!-- Label for the call companion role. [CHAR LIMIT=30] -->

    <string name="role_label_call_companion">Call companion app</string>

    <!-- Label for the assist app role. [CHAR LIMIT=30] -->

    <string name="role_label_assistant">Assist app</string>

res/xml/roles.xml

+5 −5
Original line number Diff line number Diff line
@@ -379,7 +379,7 @@ 


    <!--- @see android.telecom.InCallService -->

    <role

        name="android.app.role.CAR_MODE_DIALER_APP"

        name="android.app.role.CAR_MODE_DIALER"

        exclusive="true"

        label="@string/role_label_car_mode_dialer">

        <required-components>
@@ -398,9 +398,9 @@ 


    <!--- @see android.telecom.CallRedirectionService -->

    <role

        name="android.app.role.PROXY_CALLING_APP"

        name="android.app.role.CALL_REDIRECTION"

        exclusive="true"

        label="@string/role_label_proxy_calling">

        label="@string/role_label_call_redirection">

        <required-components>

            <service permission="android.permission.BIND_CALL_REDIRECTION_SERVICE">

                <intent-filter>
@@ -412,7 +412,7 @@ 


    <!--- @see android.telecom.CallScreeningService -->

    <role

        name="android.app.role.CALL_SCREENING_APP"

        name="android.app.role.CALL_SCREENING"

        exclusive="true"

        label="@string/role_label_call_screening">

        <required-components>
@@ -426,7 +426,7 @@ 


    <!--- @see android.telecom.InCallService -->

    <role

        name="android.app.role.CALL_COMPANION_APP"

        name="android.app.role.CALL_COMPANION"

        exclusive="false"

        label="@string/role_label_call_companion">

        <required-components>