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

Commit 30299a81 authored by Xin Li's avatar Xin Li
Browse files

Merge Android R 

Bug: 168057903
Merged-In: I6a389399d923fbb7853d99358d60a20dd85837d4
Change-Id: I1cb96400c470ba75d5667b7b9aee1f4c60354b4e
parents 87f9afd0 c741709d

Android.bp

+23 −4
Original line number Diff line number Diff line 
genrule {

    name: "statslog-telecom-java-gen",

    tools: ["stats-log-api-gen"],

    cmd: "$(location stats-log-api-gen) --java $(out) --module telecom"

        + " --javaPackage com.android.server.telecom --javaClass TelecomStatsLog",

    out: ["com/android/server/telecom/TelecomStatsLog.java"],

}



filegroup {

    name: "Telecom-srcs",

    srcs: [

        "src/**/*.java",

        ":statslog-telecom-java-gen",

    ],

}



// Build the Telecom service.

android_app {

    name: "Telecom",

    srcs: [

        "src/**/*.java",

        ":Telecom-srcs",

        "proto/**/*.proto",

    ],

    resource_dirs: ["res"],
@@ -25,7 +41,7 @@ android_test { 
    static_libs: [

        "android-ex-camera2",

        "guava",

        "mockito-target-inline",

        "mockito-target-extended",

        "androidx.test.rules",

        "platform-test-annotations",

        "androidx.legacy_legacy-support-core-ui",
@@ -36,7 +52,7 @@ android_test { 
    ],

    srcs: [

        "tests/src/**/*.java",

        "src/**/*.java",

        ":Telecom-srcs",

        "proto/**/*.proto",

    ],

    proto: {
@@ -54,7 +70,10 @@ android_test { 
        "android.test.runner",

    ],



    jni_libs: ["libdexmakerjvmtiagent"],

    jni_libs: [

        "libdexmakerjvmtiagent",

        "libstaticjvmtiagent",

    ],



    aaptflags: [

        "--auto-add-overlay",

res/raw/record.ogg

−99.3 KiB (5.14 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

res/values-af/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -31,8 +31,8 @@ 
    <string name="notification_disconnectedCall_generic_body" msgid="5282765206349184853">"Jou oproep is ontkoppel as gevolg van \'n noodoproep wat gemaak word."</string>

    <string name="notification_audioProcessing_title" msgid="1619035039880584575">"Agtergrondoproep"</string>

    <string name="notification_audioProcessing_body" msgid="6397005913770420388">"<xliff:g id="AUDIO_PROCESSING_APP_NAME">%s</xliff:g> het \'n oproep in die agtergrond geplaas. Hierdie program kan dalk toegang tot oudio kry en dit oor die oproep speel."</string>

    <string name="notification_crashedInCallService_title" msgid="7440244344965656743">"Omgevalde foonprogram"</string>

    <string name="notification_crashedInCallService_body" msgid="7821729360036047995">"Jou foonprogram <xliff:g id="IN_CALL_SERVICE_APP_NAME">%s</xliff:g> het omgeval. Jou oproep is voortgesit deur die foonprogram te gebruik wat jy saam met jou toestel gekry het."</string>

    <string name="notification_incallservice_not_responding_title" msgid="5347557574288598548">"<xliff:g id="IN_CALL_SERVICE_APP_NAME">%s</xliff:g> het opgehou reageer"</string>

    <string name="notification_incallservice_not_responding_body" msgid="9209308270131968623">"Jou oproep het die foonprogram gebruik wat saam met jou toestel gekom het"</string>

    <string name="accessibility_call_muted" msgid="2968461092554300779">"Oproep stilgemaak."</string>

    <string name="accessibility_speakerphone_enabled" msgid="555386652061614267">"Luidsprekerfoon geaktiveer."</string>

    <string name="respond_via_sms_canned_response_1" msgid="6332561460870382561">"Kan nie nou praat nie. Hoe\'s dit?"</string>

res/values-am/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -31,8 +31,8 @@ 
    <string name="notification_disconnectedCall_generic_body" msgid="5282765206349184853">"የአደጋ ጊዜ ጥሪ እየተደረገ ስለሆነ የእርስዎ ጥሪ ተቋርጧል።"</string>

    <string name="notification_audioProcessing_title" msgid="1619035039880584575">"የጀርባ ጥሪ"</string>

    <string name="notification_audioProcessing_body" msgid="6397005913770420388">"<xliff:g id="AUDIO_PROCESSING_APP_NAME">%s</xliff:g> ጥሪን ወደ ጀርባ አስቀምጧል። ይህ መተግበሪያ ጥሪው ላይ ኦዲዮ ላይ እየደረሰ ወይም እያጫወተ ሊሆን ይችላል።"</string>

    <string name="notification_crashedInCallService_title" msgid="7440244344965656743">"የተበላሸ የስልክ መተግበሪያ"</string>

    <string name="notification_crashedInCallService_body" msgid="7821729360036047995">"የስልክ መተግበሪያዎ <xliff:g id="IN_CALL_SERVICE_APP_NAME">%s</xliff:g> ተበላሽቷል። ከእርስዎ መሣሪያ ጋር የመጣውን የስልክ መተግበሪያ በመጠቀም ጥሪዎ ቀጥሏል።"</string>

    <string name="notification_incallservice_not_responding_title" msgid="5347557574288598548">"<xliff:g id="IN_CALL_SERVICE_APP_NAME">%s</xliff:g> ምላሽ መስጠት አቁሟል"</string>

    <string name="notification_incallservice_not_responding_body" msgid="9209308270131968623">"ጥሪዎ ከእርስዎ መሣሪያ ጋር የመጣውን የስልክ መተግበሪያ ተጠቅሟል"</string>

    <string name="accessibility_call_muted" msgid="2968461092554300779">"ጥሪ ፀጥ  ብሏል"</string>

    <string name="accessibility_speakerphone_enabled" msgid="555386652061614267">"የስልክ ድምፅ ማጉያ ነቅቷል።"</string>

    <string name="respond_via_sms_canned_response_1" msgid="6332561460870382561">"አሁን ማውራት አልችልም። ሰላም ነው?"</string>

res/values-ar/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -31,8 +31,8 @@ 
    <string name="notification_disconnectedCall_generic_body" msgid="5282765206349184853">"تم قطع مكالمتك بسبب إجراء مكالمة طوارئ."</string>

    <string name="notification_audioProcessing_title" msgid="1619035039880584575">"مكالمة في الخلفية"</string>

    <string name="notification_audioProcessing_body" msgid="6397005913770420388">"وضَع <xliff:g id="AUDIO_PROCESSING_APP_NAME">%s</xliff:g> مكالمة في الخلفية. يمكن لهذا التطبيق الوصول إلى الصوت وتشغيله عبر المكالمة."</string>

    <string name="notification_crashedInCallService_title" msgid="7440244344965656743">"لقد تعطّل تطبيق الهاتف"</string>

    <string name="notification_crashedInCallService_body" msgid="7821729360036047995">"لقد تعطّل تطبيق هاتفك <xliff:g id="IN_CALL_SERVICE_APP_NAME">%s</xliff:g>. تمت مواصلة مكالمتك باستخدام تطبيق \"الهاتف\" الذي أتى مع جهازك."</string>

    <string name="notification_incallservice_not_responding_title" msgid="5347557574288598548">"توقّف <xliff:g id="IN_CALL_SERVICE_APP_NAME">%s</xliff:g> عن الاستجابة"</string>

    <string name="notification_incallservice_not_responding_body" msgid="9209308270131968623">"تمت مكالمتك باستخدام تطبيق \"الهاتف\" الذي أتى مع جهازك."</string>

    <string name="accessibility_call_muted" msgid="2968461092554300779">"تم كتم صوت المكالمة."</string>

    <string name="accessibility_speakerphone_enabled" msgid="555386652061614267">"تم تفعيل مكبر صوت الهاتف."</string>

    <string name="respond_via_sms_canned_response_1" msgid="6332561460870382561">"لا يمكنني التحدث الآن. ما الأمر؟"</string>