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

Unverified Commit f8f644d9 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-12.1.0_r7' into staging/lineage-19.1_merge-android-12.1.0_r7 

Android 12.1.0 Release 7 (SQ3A.220605.009.A1)

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCYp57OgAKCRDorT+BmrEO
# eOxTAJ4kycCkByop2Dwc61k71pKbQWO0xwCdEEOau3b51qC6fLYPNbAhFEsBNDM=
# =CWiR
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue Jun  7 01:10:02 2022 EEST
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [marginal]
# gpg: initial-contribution@android.com: Verified 1180 signatures in the past
#      7 months.  Encrypted 4 messages in the past 4 months.
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 4340 D135 70EF 945E 8381  0964 E8AD 3F81 9AB1 0E78

# By Bill Yi (12) and John Shao (3)
# Via Automerger Merge Worker (16) and others
* tag 'android-12.1.0_r7':
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  No longer export CallSubjectDialog
  No longer export CallSubjectDialog
  Update min and target SDK of Contacts to 31
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE

 Conflicts:
	AndroidManifest.xml

Change-Id: I460005b1a01fbae97caaa43878dd921129e239d2
parents 02cb9949 261bd24f

AndroidManifest.xml

+3 −3
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ 
          android:versionName="1.7.33">



    <uses-sdk

        android:minSdkVersion="26"

        android:targetSdkVersion="30"/>

        android:minSdkVersion="31"

        android:targetSdkVersion="31"/>



    <original-package android:name="com.android.contacts"/>
@@ -573,7 +573,7 @@ 
        <activity

            android:name="com.android.contacts.dialog.CallSubjectDialog"

            android:theme="@style/Theme.CallSubjectDialogTheme"

            android:exported="true"

            android:exported="false"

            android:windowSoftInputMode="stateVisible|adjustResize">

            <intent-filter>

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

res/values-ar/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ 
    <string name="contact_directory_description" msgid="1773630547110881835">"الدليل <xliff:g id="TYPE">%1$s</xliff:g>"</string>

    <string name="activity_title_settings" msgid="4004290638426915162">"الإعدادات"</string>

    <string name="menu_settings" msgid="3524924670246877187">"الإعدادات"</string>

    <string name="menu_help" msgid="287801702920372292">"المساعدة والتعليقات"</string>

    <string name="menu_help" msgid="287801702920372292">"المساعدة والملاحظات"</string>

    <string name="organization_entry_two_field" msgid="6034934619269052455">"<xliff:g id="FIRST">%1$s</xliff:g> • <xliff:g id="SECOND">%2$s</xliff:g>"</string>

    <string name="organization_entry_all_field" msgid="6724345890324437167">"<xliff:g id="COMPANY">%1$s</xliff:g> • <xliff:g id="DEPARTMENT">%2$s</xliff:g> • <xliff:g id="TITLE">%3$s</xliff:g>"</string>

    <string name="non_phone_caption" msgid="7343449684187013327">"رقم الهاتف"</string>

res/values-ca/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -507,7 +507,7 @@ 
    <string name="single_sim_display_label" msgid="264062966309455515">"SIM"</string>

    <string name="show_more_content_description" msgid="6298277298495491712">"Mostra\'n més"</string>

    <string name="importing_sim_finished_title" msgid="6436721150882268416">"Importació de la targeta SIM completada"</string>

    <string name="importing_sim_failed_title" msgid="1046154274170241788">"Ha fallat la importació"</string>

    <string name="importing_sim_failed_title" msgid="1046154274170241788">"La importació ha fallat"</string>

    <string name="importing_sim_failed_message" msgid="55568522164349044">"No s\'han pogut importar els contactes de la targeta SIM"</string>

    <string name="importing_sim_in_progress_title" msgid="7647907413920018595">"S\'estan important els contactes de la SIM"</string>

    <string name="contacts_default_notification_channel" msgid="5116916969874075866">"Notificacions"</string>

res/values-eu/strings.xml

+3 −3
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
    <string name="contactInsertOrEditActivityTitle" msgid="1788154962629911262">"Gehitu kontaktu batean"</string>

    <string name="contactPickerActivityTitle" msgid="1842634991247618890">"Aukeratu kontaktu bat"</string>

    <string name="groupMemberPickerActivityTitle" msgid="8745419913947478380">"Hautatu"</string>

    <string name="header_entry_contact_list_adapter_header_title" msgid="4098233078586958762">"Sortu kontaktua"</string>

    <string name="header_entry_contact_list_adapter_header_title" msgid="4098233078586958762">"Sortu kontaktu bat"</string>

    <string name="searchHint" msgid="1487501532610025473">"Bilatu kontaktuetan"</string>

    <string name="menu_addStar" msgid="4903812703386825130">"Gehitu gogokoetan"</string>

    <string name="menu_removeStar" msgid="3707373931808303701">"Kendu gogokoetatik"</string>
@@ -190,7 +190,7 @@ 
    <string name="contact_editor_prompt_zero_accounts" msgid="4468363031413457746">"Hartu minutu pare bat Google-ko kontaktuen babeskopiak gordeko dituen kontu bat gehitzeko."</string>

    <string name="contact_editor_prompt_one_account" msgid="765343809177951169">"<xliff:g id="ACCOUNT_NAME">%1$s</xliff:g> kontuan gordeko dira kontaktu berriak."</string>

    <string name="contact_editor_prompt_multiple_accounts" msgid="1543322760761168351">"Aukeratu kontaktu berriak gordetzeko erabili nahi duzun kontua:"</string>

    <string name="contact_editor_title_new_contact" msgid="7534775011591770343">"Sortu kontaktua"</string>

    <string name="contact_editor_title_new_contact" msgid="7534775011591770343">"Sortu kontaktu bat"</string>

    <string name="contact_editor_title_existing_contact" msgid="3647774955741654029">"Editatu kontaktua"</string>

    <string name="contact_editor_title_read_only_contact" msgid="5494810291515292596">"Ikusi soilik"</string>

    <string name="contact_editor_pick_raw_contact_to_edit_dialog_title" msgid="4478782370280424187">"Aukeratu editatu beharreko kontaktua"</string>
@@ -200,7 +200,7 @@ 
    <string name="add_account" msgid="3071396624500839020">"Gehitu kontu bat"</string>

    <string name="add_new_account" msgid="573368229646104110">"Gehitu beste kontu bat"</string>

    <string name="menu_export_database" msgid="1658249125751926885">"Esportatu datu-baseko fitxategiak"</string>

    <string name="action_menu_add_new_contact_button" msgid="1201339383074001291">"Sortu kontaktua"</string>

    <string name="action_menu_add_new_contact_button" msgid="1201339383074001291">"Sortu kontaktu bat"</string>

    <string name="expanding_entry_card_view_see_more" msgid="6636033205952561590">"Ikusi gehiago"</string>

    <string name="expanding_entry_card_view_see_less" msgid="6399603072579278030">"Ikusi gutxiago"</string>

    <string name="about_card_title" msgid="6635849009952435700">"Honi buruz"</string>

res/values-it/strings.xml

+7 −7
Original line number Diff line number Diff line
@@ -66,16 +66,16 @@ 
    <string name="contacts_deleted_two_named_toast" msgid="6908761620236434380">"<xliff:g id="NAME_0">%1$s</xliff:g> e <xliff:g id="NAME_1">%2$s</xliff:g> eliminati"</string>

    <string name="contacts_deleted_many_named_toast" msgid="4879197068250337298">"<xliff:g id="NAME_0">%1$s</xliff:g>, <xliff:g id="NAME_1">%2$s</xliff:g>, <xliff:g id="NAME_2">%3$s</xliff:g>… eliminati"</string>

    <plurals name="contacts_deleted_toast" formatted="false" msgid="198534700386623765">

      <item quantity="one">Contacts deleted</item>

      <item quantity="other">Contatti eliminati</item>

      <item quantity="one">Contatto eliminato</item>

    </plurals>

    <plurals name="contacts_count" formatted="false" msgid="8804860300387044572">

      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> contacts</item>

      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> contatti</item>

      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> contatto</item>

    </plurals>

    <plurals name="contacts_count_with_account" formatted="false" msgid="1025146902085751375">

      <item quantity="one"><xliff:g id="COUNT_2">%1$d</xliff:g> contacts · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>

      <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> contatti · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>

      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> contatto · <xliff:g id="ACCOUNT_1">%2$s</xliff:g></item>

    </plurals>

    <string name="title_from_google" msgid="2554633992366572820">"Di Google"</string>

    <string name="title_from_other_accounts" msgid="7813596336566711843">"Da <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
@@ -137,8 +137,8 @@ 
    <string name="menu_add_contact" msgid="5822356185421997656">"Aggiungi ai contatti"</string>

    <string name="menu_add_contacts" msgid="7114262784903366463">"Aggiungi"</string>

    <plurals name="title_share_via" formatted="false" msgid="3868648642107664607">

      <item quantity="one">Share contacts via</item>

      <item quantity="other">Condividi contatti tramite</item>

      <item quantity="one">Condividi contatto tramite</item>

    </plurals>

    <string name="dialog_new_group_account" msgid="4326402875327788728">"Scegli account"</string>

    <string name="group_name_dialog_insert_title" msgid="5495572488613178283">"Crea etichetta"</string>
@@ -381,12 +381,12 @@ 
    <string name="import_from_sim" msgid="7825280799813847991">"Scheda SIM"</string>

    <string name="import_from_sim_summary_fmt" msgid="4234771828377985321">"SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>

    <plurals name="import_from_sim_secondary_contact_count_fmt" formatted="false" msgid="8737770002554878728">

      <item quantity="one">%1$d contacts</item>

      <item quantity="other">%1$d contatti</item>

      <item quantity="one">1 contatto</item>

    </plurals>

    <plurals name="import_from_sim_secondary_template" formatted="false" msgid="6698670511061586532">

      <item quantity="one"><xliff:g id="COUNT_2">^1</xliff:g> contacts • <xliff:g id="PHONE_NUMBER_3">^2</xliff:g></item>

      <item quantity="other"><xliff:g id="COUNT_2">^1</xliff:g> contatti • <xliff:g id="PHONE_NUMBER_3">^2</xliff:g></item>

      <item quantity="one"><xliff:g id="COUNT_0">^1</xliff:g> contatto • <xliff:g id="PHONE_NUMBER_1">^2</xliff:g></item>

    </plurals>

    <string name="import_from_vcf_file" msgid="6776403212804361301">"File .vcf"</string>

    <string name="nothing_to_import_message" msgid="2594519620375509783">"Niente da importare"</string>
@@ -491,8 +491,8 @@ 
    <string name="sim_import_empty_message" msgid="7238368542566545854">"Nessun contatto presente nella SIM"</string>

    <string name="sim_import_contact_exists_toast" msgid="8423212007841229749">"Contatto già esistente nell\'elenco"</string>

    <plurals name="sim_import_success_toast_fmt" formatted="false" msgid="422539156156042210">

      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> SIM contacts imported</item>

      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> contatti della SIM importati</item>

      <item quantity="one">1 contatto della SIM importato</item>

    </plurals>

    <string name="sim_import_failed_toast" msgid="358117391138073786">"Impossibile importare i contatti della SIM"</string>

    <string name="sim_import_title" msgid="8202961146093040684">"Importa da SIM"</string>