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

Commit 728c412a authored by Xin Li's avatar Xin Li
Browse files

DO NOT MERGE - Merge Android 10 into master 

Bug: 139893257
Change-Id: I62fbdaa466973145ddd98a0b88fdb500fad84a02
parents b11675a9 141b9fc7

AndroidManifest.xml

+2 −12
Original line number Diff line number Diff line
@@ -38,11 +38,13 @@ 
    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />

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

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

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

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

    <!-- Required to determine source of ongoing audio recordings. -->

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

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

    <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_EXTERNAL_STORAGE" />

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

    <uses-permission android:name="android.permission.STOP_APP_SWITCHES" />
@@ -304,18 +306,6 @@ 
                  android:process=":ui">

        </activity>



        <activity android:name=".components.ChangeDefaultDialerDialog"

                  android:label="@string/change_default_dialer_dialog_title"

                  android:excludeFromRecents="true"

                  android:theme="@*android:style/Theme.Material.Light.Dialog.Alert"

                  android:priority="1000"

                  android:process=":ui" >

            <intent-filter>

                <action android:name="android.telecom.action.CHANGE_DEFAULT_DIALER" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

        </activity>



        <activity android:name=".ui.TelecomDeveloperMenu"

                  android:label="@string/developer_title"

                  android:exported="false"

proguard.flags

+0 −4
Original line number Diff line number Diff line
@@ -13,10 +13,6 @@ 
# Keep classes, annotations and members used by Lifecycle. Remove this once aapt2 is enabled

-keepattributes *Annotation*



-keepclassmembers enum android.arch.lifecycle.Lifecycle$Event {

    <fields>;

}



-keep class * implements android.arch.lifecycle.LifecycleObserver {

}

res/values-af/strings.xml

+24 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>

    <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Vinnige antwoord"</string>

    <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Boodskap gestuur na <xliff:g id="PHONE_NUMBER">%s</xliff:g>."</string>

    <string name="respond_via_sms_failure_format" msgid="90791421289769504">"Kon nie boodskap aan <xliff:g id="PHONE_NUMBER">%s</xliff:g> stuur nie."</string>

    <string name="enable_account_preference_title" msgid="2021848090086481720">"Oproeprekeninge"</string>

    <string name="outgoing_call_not_allowed_user_restriction" msgid="6872406278300131364">"Net noodoproepe word toegelaat."</string>

    <string name="outgoing_call_not_allowed_no_permission" msgid="1996571596464271228">"Hierdie program kan nie uitgaande oproepe maak sonder die foon se toestemming nie."</string>
@@ -49,6 +50,11 @@ 
    <string name="change_default_dialer_dialog_affirmative" msgid="8606546663509166276">"Stel verstek"</string>

    <string name="change_default_dialer_dialog_negative" msgid="9078144617060173845">"Kanselleer"</string>

    <string name="change_default_dialer_warning_message" msgid="1417671460801684999">"<xliff:g id="NEW_APP">%s</xliff:g> sal oproepe kan maak en alle aspekte daarvan beheer. Net programme wat jy vertrou, moet as die verstek-Foon-program gestel word."</string>

    <string name="change_default_call_screening_dialog_title" msgid="8714534302859934164">"Maak <xliff:g id="NEW_APP">%s</xliff:g> jou verstek-oproepsiftingsprogram?"</string>

    <string name="change_default_call_screening_warning_message_for_disable_old_app" msgid="5128397581530600941">"<xliff:g id="OLD_APP">%s</xliff:g> sal nie meer oproepe kan sif nie."</string>

    <string name="change_default_call_screening_warning_message" msgid="3881131132588596837">"<xliff:g id="NEW_APP">%s</xliff:g> sal inligting oor bellers kan sien wat nie in jou kontakte is nie en hulle sal hierdie oproepe kan blokkeer. Net programme wat jy vertrou, moet as die verstek-oproepsiftingsprogram gestel word."</string>

    <string name="change_default_call_screening_dialog_affirmative" msgid="5503888845998386856">"Stel verstek"</string>

    <string name="change_default_call_screening_dialog_negative" msgid="3420459312464019224">"Kanselleer"</string>

    <string name="blocked_numbers" msgid="2751843139572970579">"Geblokkeerde nommers"</string>

    <string name="blocked_numbers_msg" msgid="1045015186124965643">"Jy sal nie oproepe of boodskappe vanaf geblokkeerde nommers ontvang nie."</string>

    <string name="block_number" msgid="1101252256321306179">"Voeg \'n nommer by"</string>
@@ -77,10 +83,28 @@ 
    <string name="answering_ends_other_managed_video_call" msgid="1585423762458248435">"As jy antwoord, sal dit jou huidige video-oproep beëindig"</string>

    <string name="answer_incoming_call" msgid="4140530013111794587">"Antwoord"</string>

    <string name="decline_incoming_call" msgid="806026168661598368">"Wys af"</string>

    <string name="cant_call_due_to_no_supported_service" msgid="5128162419227548372">"Oproep kan nie geplaas word nie, want daar is geen oproeprekeninge wat hierdie tipe oproepe ondersteun nie."</string>

    <string name="cant_call_due_to_ongoing_call" msgid="4952615196237854748">"Oproep kan nie gemaak word nie weens jou <xliff:g id="OTHER_CALL">%1$s</xliff:g>-oproep."</string>

    <string name="cant_call_due_to_ongoing_calls" msgid="1380804892363503856">"Oproep kan nie gemaak word nie weens jou <xliff:g id="OTHER_CALL">%1$s</xliff:g>-oproepe."</string>

    <string name="cant_call_due_to_ongoing_unknown_call" msgid="149091978697302211">"Oproep kan nie gemaak word nie weens \'n oproep in \'n ander program."</string>

    <string name="notification_channel_incoming_call" msgid="3513761697082968084">"Inkomende oproepe"</string>

    <string name="notification_channel_missed_call" msgid="8727062678632713146">"Gemiste oproepe"</string>

    <string name="notification_channel_call_blocking" msgid="2943358779746676070">"Oproepblokkering"</string>

    <string name="alert_outgoing_call" msgid="982908156825958001">"As jy hierdie oproep maak, sal dit jou <xliff:g id="OTHER_APP">%1$s</xliff:g>-oproep beëindig."</string>

    <string name="alert_redirect_outgoing_call" msgid="1267579501303765238">"Laat <xliff:g id="OTHER_APP">%1$s</xliff:g> toe om \'n oproep te maak deur \'n ander nommer of rekening te gebruik."</string>

    <string name="alert_redirect_outgoing_call_timeout" msgid="7268954889515301158">"Oproep kan nie deur <xliff:g id="OTHER_APP">%1$s</xliff:g> geplaas word nie. Probeer om \'n ander oproepherlei-toepassing te gebruik of die ontwikkelaar vir hulp te kontak."</string>

    <string name="phone_settings_call_blocking_txt" msgid="3976004073043846733">"Oproepblokkering"</string>

    <string name="phone_settings_number_not_in_contact_txt" msgid="3126829421867168652">"Nommers nie in Kontakte nie"</string>

    <string name="phone_settings_number_not_in_contact_summary_txt" msgid="9043147855140079119">"Blokkeer nommers wat nie in jou Kontakte gelys is nie"</string>

    <string name="phone_settings_private_num_txt" msgid="8623574188879134262">"Privaat"</string>

    <string name="phone_settings_private_num_summary_txt" msgid="7516314821207782191">"Blokkeer bellers wat nie hulle nommer bekendmaak nie"</string>

    <string name="phone_settings_payphone_txt" msgid="2493356957416981318">"Telefoonhokkies"</string>

    <string name="phone_settings_payphone_summary_txt" msgid="6126709946103814653">"Blokkeer oproepe vanaf telefoonhokkies"</string>

    <string name="phone_settings_unknown_txt" msgid="5836407031508172721">"Onbekend"</string>

    <string name="phone_settings_unknown_summary_txt" msgid="3457690230497753233">"Blokkeer oproepe vanaf onbekende bellers"</string>

    <string name="phone_strings_call_blocking_turned_off_notification_title_txt" msgid="628536625775266096">"Oproepblokkering"</string>

    <string name="phone_strings_call_blocking_turned_off_notification_text_txt" msgid="6264230048947693941">"Oproepblokkering is gedeaktiveer"</string>

    <string name="phone_strings_emergency_call_made_dialog_title_txt" msgid="7421611725400166580">"Noodoproep gemaak"</string>

    <string name="phone_strings_emergency_call_made_dialog_call_blocking_text_txt" msgid="4083285098613193052">"Oproepblokkering is gedeaktiveer sodat noodeenhede jou kan kontak."</string>

    <string name="developer_title" msgid="1816273446906554627">"Telecom-ontwikkelaarkieslys"</string>

</resources>

res/values-am/strings.xml

+24 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>

    <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"ፈጣን ምላሽ"</string>

    <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"ለ <xliff:g id="PHONE_NUMBER">%s</xliff:g> የተላከ መልዕክት"</string>

    <string name="respond_via_sms_failure_format" msgid="90791421289769504">"መልዕክት ወደ <xliff:g id="PHONE_NUMBER">%s</xliff:g> መላክ አልተሳካም።"</string>

    <string name="enable_account_preference_title" msgid="2021848090086481720">"የመደወያ መለያዎች"</string>

    <string name="outgoing_call_not_allowed_user_restriction" msgid="6872406278300131364">"የድንገተኛ አደጋ ጥሪዎች ብቻ ናቸው የሚፈቀዱት።"</string>

    <string name="outgoing_call_not_allowed_no_permission" msgid="1996571596464271228">"ይህ መተግበሪያ ያለስልኩ ፈቃድ ወጪ ጥሪዎችን ማድረግ አይችልም።"</string>
@@ -49,6 +50,11 @@ 
    <string name="change_default_dialer_dialog_affirmative" msgid="8606546663509166276">"ነባሪ አዘጋጅ"</string>

    <string name="change_default_dialer_dialog_negative" msgid="9078144617060173845">"ይቅር"</string>

    <string name="change_default_dialer_warning_message" msgid="1417671460801684999">"<xliff:g id="NEW_APP">%s</xliff:g> ጥሪዎች ማድረግ እና ሁሉንም የጥሪ ገጽታዎች መቆጣጠር ይችላል። ነባሪ መተግበሪያ መደረግ ያለባቸው እርስዎ የሚያምኗቸው መተግበሪያዎች ብቻ መሆን አለባቸው።"</string>

    <string name="change_default_call_screening_dialog_title" msgid="8714534302859934164">"<xliff:g id="NEW_APP">%s</xliff:g>ን የእርስዎ ነባሪ የጥሪ ማጣሪያ መተግበሪያ ይደረግ?"</string>

    <string name="change_default_call_screening_warning_message_for_disable_old_app" msgid="5128397581530600941">"<xliff:g id="OLD_APP">%s</xliff:g> ከእንግዲህ ወዲያ ጥሪዎችን ማጣራት አይችልም።"</string>

    <string name="change_default_call_screening_warning_message" msgid="3881131132588596837">"<xliff:g id="NEW_APP">%s</xliff:g> በእርስዎ እውቂያዎች ውስጥ ስለ ደዋዮች መረጃዎችን ማየት እና እነዚህን ጥሪዎች ማገድ ይችላል። እርስዎ የሚያምኗቸው መተግበሪያዎች ብቻ እንደ ነባሪ የጥሪ ማጣሪያ መተግበሪያ መዘጋጀት አለባቸው።"</string>

    <string name="change_default_call_screening_dialog_affirmative" msgid="5503888845998386856">"ነባሪ ያዘጋጁ"</string>

    <string name="change_default_call_screening_dialog_negative" msgid="3420459312464019224">"ይቅር"</string>

    <string name="blocked_numbers" msgid="2751843139572970579">"የታገዱ ቁጥሮች"</string>

    <string name="blocked_numbers_msg" msgid="1045015186124965643">"ከታገዱ ቁጥሮች ጥሪዎች ወይም ጽሑፎች አይቀበሉም።"</string>

    <string name="block_number" msgid="1101252256321306179">"ቁጥር ያክሉ"</string>
@@ -77,10 +83,28 @@ 
    <string name="answering_ends_other_managed_video_call" msgid="1585423762458248435">"መመለስ እየተካሄደ ያለ የቪዲዮ ጥሪዎን ይጨርሳል"</string>

    <string name="answer_incoming_call" msgid="4140530013111794587">"ይመልሱ"</string>

    <string name="decline_incoming_call" msgid="806026168661598368">"አትቀበል"</string>

    <string name="cant_call_due_to_no_supported_service" msgid="5128162419227548372">"የዚህን አይነት ጥሪዎች የሚደግፉ መደወያ መለያዎች ስለሌሉ ጥሪ መደረግ አይችልም።"</string>

    <string name="cant_call_due_to_ongoing_call" msgid="4952615196237854748">"በ<xliff:g id="OTHER_CALL">%1$s</xliff:g> ጥሪዎ ምክንያት ጥሪ መደረግ አይችልም።"</string>

    <string name="cant_call_due_to_ongoing_calls" msgid="1380804892363503856">"በ<xliff:g id="OTHER_CALL">%1$s</xliff:g> ጥሪዎችዎ ምክንያት ጥሪዎች መደረግ አይችሉም።"</string>

    <string name="cant_call_due_to_ongoing_unknown_call" msgid="149091978697302211">"በሌላ መተግበሪያ ውስጥ ባለ ጥሪ ምክንያት ጥሪ መደረግ አይችልም።"</string>

    <string name="notification_channel_incoming_call" msgid="3513761697082968084">"ገቢ ጥሪዎች"</string>

    <string name="notification_channel_missed_call" msgid="8727062678632713146">"ያመለጡ ጥሪዎች"</string>

    <string name="notification_channel_call_blocking" msgid="2943358779746676070">"ጥሪን ማገድ"</string>

    <string name="alert_outgoing_call" msgid="982908156825958001">"ይህን ጥሪ ማድረግ የ<xliff:g id="OTHER_APP">%1$s</xliff:g> ጥሪዎን ያቋርጣል።"</string>

    <string name="alert_redirect_outgoing_call" msgid="1267579501303765238">"<xliff:g id="OTHER_APP">%1$s</xliff:g> ሌላ ቁጥር ወይም መለያ በመጠቀም ጥሪ እንዲያደርግ ይፍቀዱ።"</string>

    <string name="alert_redirect_outgoing_call_timeout" msgid="7268954889515301158">"ጥሪ በ <xliff:g id="OTHER_APP">%1$s</xliff:g> መደረግ አይችልም። ሌላ የጥሪ አቅጣጫ ማስቀየሪያ መተግበሪያ ለመጠቀም ወይም አልሚውን እገዛ ለመጠየቅ ይሞክሩ።"</string>

    <string name="phone_settings_call_blocking_txt" msgid="3976004073043846733">"ጥሪን ማገድ"</string>

    <string name="phone_settings_number_not_in_contact_txt" msgid="3126829421867168652">"ቁጥሮች በእውቂያዎች ውስጥ የሉም"</string>

    <string name="phone_settings_number_not_in_contact_summary_txt" msgid="9043147855140079119">"በእውቂያዎችዎ ውስጥ ያልተዘረዘሩ ቁጥሮችን አግድ"</string>

    <string name="phone_settings_private_num_txt" msgid="8623574188879134262">"የግል"</string>

    <string name="phone_settings_private_num_summary_txt" msgid="7516314821207782191">"ቁጥራቸውን የማይገልጹ ደዋዮችን አግድ"</string>

    <string name="phone_settings_payphone_txt" msgid="2493356957416981318">"የክፍያ ስልክ"</string>

    <string name="phone_settings_payphone_summary_txt" msgid="6126709946103814653">"የክፍያ ስልኮች የሚመጡ ጥሪዎችን አግድ"</string>

    <string name="phone_settings_unknown_txt" msgid="5836407031508172721">"ያልታወቀ"</string>

    <string name="phone_settings_unknown_summary_txt" msgid="3457690230497753233">"ካልታወቁ ደዋዮች የሚመጡ ጥሪዎችን አግድ"</string>

    <string name="phone_strings_call_blocking_turned_off_notification_title_txt" msgid="628536625775266096">"ጥሪን ማገድ"</string>

    <string name="phone_strings_call_blocking_turned_off_notification_text_txt" msgid="6264230048947693941">"ጥሪ ማገድ ተሰናክሏል"</string>

    <string name="phone_strings_emergency_call_made_dialog_title_txt" msgid="7421611725400166580">"የአደጋ ጊዜ ጥሪ ተደርጓል"</string>

    <string name="phone_strings_emergency_call_made_dialog_call_blocking_text_txt" msgid="4083285098613193052">"የአደጋ ጊዜ ምላሽ ሰጪዎች እርስዎን ለማግኘት እንዲችሉ ጥሪ ማገድ ተሰናክሏል።"</string>

    <string name="developer_title" msgid="1816273446906554627">"የቴሌኮም ገንቢ ምናሌ"</string>

</resources>

res/values-ar/strings.xml

+31 −7

File changed.

Preview size limit exceeded, changes collapsed.