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

Commit 2a2cc230 authored by Xin Li's avatar Xin Li
Browse files

Merge sc-dev-plus-aosp-without-vendor@7634622 

Merged-In: I322c6a9d84b2e765389193bc93872fae641b6676
Change-Id: I1af8f02da1e99973cdf3ee742bf1858f1472fd6f
parents aaef4c93 acd591cf

AndroidManifest.xml

+3 −0
Original line number Original line Diff line number Diff line
@@ -47,6 +47,7 @@ 
    <uses-permission android:name="android.permission.READ_CALL_LOG"/>

    <uses-permission android:name="android.permission.READ_CALL_LOG"/>

    <uses-permission android:name="android.permission.READ_DEVICE_CONFIG"/>

    <uses-permission android:name="android.permission.READ_DEVICE_CONFIG"/>

    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>

    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>

    <uses-permission android:name="android.permission.READ_PROJECTION_STATE"/>

    <uses-permission android:name="android.permission.SEND_SMS"/>

    <uses-permission android:name="android.permission.SEND_SMS"/>

    <uses-permission android:name="android.permission.STOP_APP_SWITCHES"/>

    <uses-permission android:name="android.permission.STOP_APP_SWITCHES"/>

    <uses-permission android:name="android.permission.VIBRATE"/>

    <uses-permission android:name="android.permission.VIBRATE"/>
@@ -165,6 +166,7 @@ 
        <activity-alias android:name="PrivilegedCallActivity"

        <activity-alias android:name="PrivilegedCallActivity"

             android:targetActivity=".components.UserCallActivity"

             android:targetActivity=".components.UserCallActivity"

             android:permission="android.permission.CALL_PRIVILEGED"

             android:permission="android.permission.CALL_PRIVILEGED"

             android:exported="true"

             android:process=":ui">

             android:process=":ui">

            <intent-filter android:priority="1000">

            <intent-filter android:priority="1000">

                <action android:name="android.intent.action.CALL_PRIVILEGED"/>

                <action android:name="android.intent.action.CALL_PRIVILEGED"/>
@@ -200,6 +202,7 @@ 
        <activity-alias android:name="EmergencyCallActivity"

        <activity-alias android:name="EmergencyCallActivity"

             android:targetActivity=".components.UserCallActivity"

             android:targetActivity=".components.UserCallActivity"

             android:permission="android.permission.CALL_PRIVILEGED"

             android:permission="android.permission.CALL_PRIVILEGED"

             android:exported="true"

             android:process=":ui">

             android:process=":ui">

            <intent-filter android:priority="1000">

            <intent-filter android:priority="1000">

                <action android:name="android.intent.action.CALL_EMERGENCY"/>

                <action android:name="android.intent.action.CALL_EMERGENCY"/>

res/values-es/strings.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -99,7 +99,7 @@ 
    <string name="notification_channel_call_blocking" msgid="2028807677868598710">"Bloqueo de llamadas"</string>

    <string name="notification_channel_call_blocking" msgid="2028807677868598710">"Bloqueo de llamadas"</string>

    <string name="notification_channel_background_calls" msgid="7785659903711350506">"Llamadas en segundo plano"</string>

    <string name="notification_channel_background_calls" msgid="7785659903711350506">"Llamadas en segundo plano"</string>

    <string name="notification_channel_disconnected_calls" msgid="8228636543997645757">"Llamadas interrumpidas"</string>

    <string name="notification_channel_disconnected_calls" msgid="8228636543997645757">"Llamadas interrumpidas"</string>

    <string name="notification_channel_in_call_service_crash" msgid="7313237519166984267">"Aplicaciones para teléfonos con fallos"</string>

    <string name="notification_channel_in_call_service_crash" msgid="7313237519166984267">"Aplicaciones para teléfonos con bloqueos"</string>

    <string name="alert_outgoing_call" msgid="5319895109298927431">"Si haces esta llamada, se finalizará la de <xliff:g id="OTHER_APP">%1$s</xliff:g>."</string>

    <string name="alert_outgoing_call" msgid="5319895109298927431">"Si haces esta llamada, se finalizará la de <xliff:g id="OTHER_APP">%1$s</xliff:g>."</string>

    <string name="alert_redirect_outgoing_call_or_not" msgid="665409645789521636">"Elige cómo quieres hacer esta llamada"</string>

    <string name="alert_redirect_outgoing_call_or_not" msgid="665409645789521636">"Elige cómo quieres hacer esta llamada"</string>

    <string name="alert_place_outgoing_call_with_redirection" msgid="5221065030959024121">"Redirigir llamada con <xliff:g id="OTHER_APP">%1$s</xliff:g>"</string>

    <string name="alert_place_outgoing_call_with_redirection" msgid="5221065030959024121">"Redirigir llamada con <xliff:g id="OTHER_APP">%1$s</xliff:g>"</string>

res/values-fr-rCA/strings.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -104,7 +104,7 @@ 
    <string name="alert_redirect_outgoing_call_or_not" msgid="665409645789521636">"Choisissez comment passer cet appel"</string>

    <string name="alert_redirect_outgoing_call_or_not" msgid="665409645789521636">"Choisissez comment passer cet appel"</string>

    <string name="alert_place_outgoing_call_with_redirection" msgid="5221065030959024121">"Rediriger l\'appel en utilisant <xliff:g id="OTHER_APP">%1$s</xliff:g>"</string>

    <string name="alert_place_outgoing_call_with_redirection" msgid="5221065030959024121">"Rediriger l\'appel en utilisant <xliff:g id="OTHER_APP">%1$s</xliff:g>"</string>

    <string name="alert_place_unredirect_outgoing_call" msgid="2467608535225764006">"Appeler en utilisant mon numéro de téléphone"</string>

    <string name="alert_place_unredirect_outgoing_call" msgid="2467608535225764006">"Appeler en utilisant mon numéro de téléphone"</string>

    <string name="alert_redirect_outgoing_call_timeout" msgid="5568101425637373060">"Impossible de passer l\'appel au moyen de l\'application <xliff:g id="OTHER_APP">%1$s</xliff:g>. Essayez d\'utiliser une autre application de redirection d\'appels ou de communiquer avec le développeur de l\'application pour obtenir de l\'aide."</string>

    <string name="alert_redirect_outgoing_call_timeout" msgid="5568101425637373060">"Impossible de passer l\'appel au moyen de l\'application <xliff:g id="OTHER_APP">%1$s</xliff:g>. Essayez d\'utiliser une autre application de redirection d\'appels ou de communiquer avec le concepteur de l\'application pour obtenir de l\'aide."</string>

    <string name="phone_settings_call_blocking_txt" msgid="7311523114822507178">"Blocage des appels"</string>

    <string name="phone_settings_call_blocking_txt" msgid="7311523114822507178">"Blocage des appels"</string>

    <string name="phone_settings_number_not_in_contact_txt" msgid="2602249106007265757">"Numéros non répertoriés dans les contacts"</string>

    <string name="phone_settings_number_not_in_contact_txt" msgid="2602249106007265757">"Numéros non répertoriés dans les contacts"</string>

    <string name="phone_settings_number_not_in_contact_summary_txt" msgid="963327038085718969">"Bloquer les numéros non répertoriés dans vos contacts"</string>

    <string name="phone_settings_number_not_in_contact_summary_txt" msgid="963327038085718969">"Bloquer les numéros non répertoriés dans vos contacts"</string>

res/values-gl/strings.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -88,7 +88,7 @@ 
    <string name="answering_ends_other_managed_call" msgid="4031778317409881805">"Ao responder, finalizará a túa chamada en curso"</string>

    <string name="answering_ends_other_managed_call" msgid="4031778317409881805">"Ao responder, finalizará a túa chamada en curso"</string>

    <string name="answering_ends_other_managed_calls" msgid="3974069768615307659">"Ao responder, finalizarán as túas chamadas en curso"</string>

    <string name="answering_ends_other_managed_calls" msgid="3974069768615307659">"Ao responder, finalizarán as túas chamadas en curso"</string>

    <string name="answering_ends_other_managed_video_call" msgid="1988508241432031327">"Ao responder, finalizarán as túas videochamadas en curso"</string>

    <string name="answering_ends_other_managed_video_call" msgid="1988508241432031327">"Ao responder, finalizarán as túas videochamadas en curso"</string>

    <string name="answer_incoming_call" msgid="2045888814782215326">"Contestar"</string>

    <string name="answer_incoming_call" msgid="2045888814782215326">"Responder"</string>

    <string name="decline_incoming_call" msgid="922147089348451310">"Rexeitar"</string>

    <string name="decline_incoming_call" msgid="922147089348451310">"Rexeitar"</string>

    <string name="cant_call_due_to_no_supported_service" msgid="1635626384149947077">"Non se pode realizar a chamada porque non hai ningunha conta de chamadas que admita chamadas deste tipo."</string>

    <string name="cant_call_due_to_no_supported_service" msgid="1635626384149947077">"Non se pode realizar a chamada porque non hai ningunha conta de chamadas que admita chamadas deste tipo."</string>

    <string name="cant_call_due_to_ongoing_call" msgid="8004235328451385493">"Non se pode realizar a chamada porque hai unha chamada en curso en <xliff:g id="OTHER_CALL">%1$s</xliff:g>."</string>

    <string name="cant_call_due_to_ongoing_call" msgid="8004235328451385493">"Non se pode realizar a chamada porque hai unha chamada en curso en <xliff:g id="OTHER_CALL">%1$s</xliff:g>."</string>

res/values-in/strings.xml

+3 −3
Original line number Original line Diff line number Diff line
@@ -65,13 +65,13 @@ 
    <string name="blocked_numbers" msgid="8322134197039865180">"Nomor yang diblokir"</string>

    <string name="blocked_numbers" msgid="8322134197039865180">"Nomor yang diblokir"</string>

    <string name="blocked_numbers_msg" msgid="2797422132329662697">"Anda tidak akan menerima telepon atau SMS dari nomor yang diblokir."</string>

    <string name="blocked_numbers_msg" msgid="2797422132329662697">"Anda tidak akan menerima telepon atau SMS dari nomor yang diblokir."</string>

    <string name="block_number" msgid="3784343046852802722">"Tambahkan nomor"</string>

    <string name="block_number" msgid="3784343046852802722">"Tambahkan nomor"</string>

    <string name="unblock_dialog_body" msgid="2723393535797217261">"Berhenti memblokir <xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g>?"</string>

    <string name="unblock_dialog_body" msgid="2723393535797217261">"Batalkan pemblokiran <xliff:g id="NUMBER_TO_BLOCK">%1$s</xliff:g>?"</string>

    <string name="unblock_button" msgid="8732021675729981781">"Berhenti memblokir"</string>

    <string name="unblock_button" msgid="8732021675729981781">"Batalkan pemblokiran"</string>

    <string name="add_blocked_dialog_body" msgid="8599974422407139255">"Blokir panggilan telepon dan SMS dari"</string>

    <string name="add_blocked_dialog_body" msgid="8599974422407139255">"Blokir panggilan telepon dan SMS dari"</string>

    <string name="add_blocked_number_hint" msgid="8769422085658041097">"Nomor telepon"</string>

    <string name="add_blocked_number_hint" msgid="8769422085658041097">"Nomor telepon"</string>

    <string name="block_button" msgid="485080149164258770">"Blokir"</string>

    <string name="block_button" msgid="485080149164258770">"Blokir"</string>

    <string name="non_primary_user" msgid="315564589279622098">"Hanya pemilik perangkat yang dapat melihat dan mengelola nomor yang diblokir."</string>

    <string name="non_primary_user" msgid="315564589279622098">"Hanya pemilik perangkat yang dapat melihat dan mengelola nomor yang diblokir."</string>

    <string name="delete_icon_description" msgid="5335959254954774373">"Berhenti memblokir"</string>

    <string name="delete_icon_description" msgid="5335959254954774373">"Bebaskan"</string>

    <string name="blocked_numbers_butter_bar_title" msgid="582982373755950791">"Blokir dinonaktifkan sementara"</string>

    <string name="blocked_numbers_butter_bar_title" msgid="582982373755950791">"Blokir dinonaktifkan sementara"</string>

    <string name="blocked_numbers_butter_bar_body" msgid="1261213114919301485">"Setelah Anda menelepon atau mengirim SMS ke nomor gawat darurat, blokir akan dinonaktifkan agar layanan gawat darurat tersebut dapat menghubungi Anda."</string>

    <string name="blocked_numbers_butter_bar_body" msgid="1261213114919301485">"Setelah Anda menelepon atau mengirim SMS ke nomor gawat darurat, blokir akan dinonaktifkan agar layanan gawat darurat tersebut dapat menghubungi Anda."</string>

    <string name="blocked_numbers_butter_bar_button" msgid="2704456308072489793">"Aktifkan lagi sekarang"</string>

    <string name="blocked_numbers_butter_bar_button" msgid="2704456308072489793">"Aktifkan lagi sekarang"</string>