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

Unverified Commit 34a06070 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-16.0.0_r3' into staging/lineage-23.0_merge-android-16.0.0_r3 

Android 16.0.0 Release 3 (BP3A.250905.014)

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCaRO/HAAKCRDorT+BmrEO
# eAZ7AJsHhdCu5OPaH0ZbNmTfH1hjeV5HTwCgiaWnEXPjJO2DEXNd8dNY/Orlyow=
# =Q1Vt
# -----END PGP SIGNATURE-----
# gpg: Signature made Wed Nov 12 00:56:28 2025 EET
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [ultimate]

# By Bill Yi (8) and others
# Via Android Build Coastguard Worker (15) and Android (Google) Code Review (1)
* tag 'android-16.0.0_r3':
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Show account selection dialog when a single account exists.
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Integrate CP2 Android B Default Account APIs
  Bump minSdk to 36
  Format files needed for Android B integration
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE

 Conflicts:
	src/com/android/contacts/activities/ContactEditorAccountsChangedActivity.java
	src/com/android/contacts/list/DefaultContactBrowseListFragment.java
	src/com/android/contacts/model/AccountTypeManager.java
	src/com/android/contacts/model/DeviceLocalAccountLocator.java
	src/com/android/contacts/preference/DisplayOptionsPreferenceFragment.java
	src/com/android/contacts/quickcontact/QuickContactActivity.java

Change-Id: I9950257d9bcb8d8be09ddd56a705ba432a99a5f0
parents 3751e5b5 309e0004

AndroidManifest.xml

+2 −9
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ 
          android:versionName="1.7.34">



    <uses-sdk

        android:minSdkVersion="34"

        android:targetSdkVersion="34"/>

        android:minSdkVersion="36"

        android:targetSdkVersion="36"/>



    <original-package android:name="com.android.contacts"/>
@@ -393,13 +393,6 @@ 


        </activity-alias>



        <!-- Accounts changed prompt that can appear when creating a new contact. -->

        <activity

            android:name=".activities.ContactEditorAccountsChangedActivity"

            android:exported="false"

            android:theme="@style/ContactEditorAccountsChangedActivityTheme"

            android:windowSoftInputMode="adjustResize"/>



        <!-- Edit or create a contact with only the most important fields displayed initially. -->

        <activity

            android:name=".activities.ContactEditorActivity"

res/values-af/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ 
    <string name="quickcontact_transparent_view_description" msgid="7783027850792852265">"Klik om na die vorige skerm terug te keer"</string>

    <string name="quickcontact_add_phone_number" msgid="1683577288080727862">"Voeg foonnommer by"</string>

    <string name="quickcontact_add_email" msgid="1442894568471116797">"Voeg e-pos by"</string>

    <string name="missing_app" msgid="5674389915738964148">"Geen program is gevind om hierdie handeling te behartig nie."</string>

    <string name="missing_app" msgid="5674389915738964148">"Geen app is gevind om hierdie handeling te behartig nie."</string>

    <string name="menu_share" msgid="6343022811796001773">"Deel"</string>

    <string name="menu_add_contact" msgid="5822356185421997656">"Voeg by kontakte"</string>

    <string name="menu_add_contacts" msgid="7114262784903366463">"Voeg by"</string>
@@ -276,7 +276,7 @@ 
    <string name="sms_by_shortcut" msgid="4682340916268521006">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Boodskap)"</string>

    <string name="description_video_call" msgid="4956825008907720371">"Maak video-oproep"</string>

    <string name="clearFrequentsConfirmation_title" msgid="9194415661170740437">"Vee dikwels-gebruikte kontakte uit?"</string>

    <string name="clearFrequentsConfirmation" msgid="2120741757522063938">"Jy gaan die lys van dikwels gebruikte kontakte in die Kontakte- en Foon-program uitvee en e-posprogramme dwing om jou adresvoorkeure van nuuts af te leer."</string>

    <string name="clearFrequentsConfirmation" msgid="2120741757522063938">"Jy gaan die lys van dikwels gebruikte kontakte in die Kontakte- en Foon-app uitvee en e-posapps dwing om jou adresvoorkeure van nuuts af te leer."</string>

    <string name="clearFrequentsProgress_title" msgid="8271935295080659743">"Vee tans dikwels-gebruikte kontakte uit..."</string>

    <string name="status_available" msgid="8081626460682959098">"Beskikbaar"</string>

    <string name="status_away" msgid="2677693194455091315">"Weg"</string>

res/values-b+sr+Latn/strings.xml

+11 −11
Original line number Diff line number Diff line
@@ -133,8 +133,8 @@ 
    <string name="group_name_dialog_update_title" msgid="3955919589366745101">"Preimenujte oznaku"</string>

    <string name="group_name_dialog_hint" msgid="6023999218213062973">"Ime oznake"</string>

    <string name="label_name_dialog_hint" msgid="7027635439255596191">"Ime oznake"</string>

    <string name="audio_chat" msgid="5921525823973697372">"Audio ćaskanje"</string>

    <string name="video_chat" msgid="2477295971622477433">"Video ćaskanje"</string>

    <string name="audio_chat" msgid="5921525823973697372">"Audio čet"</string>

    <string name="video_chat" msgid="2477295971622477433">"Video čet"</string>

    <string name="account_type_format" msgid="4926968760755013450">"<xliff:g id="SOURCE">%1$s</xliff:g>"</string>

    <string name="google_account_type_format" msgid="4046692740262396811">"<xliff:g id="SOURCE">%1$s</xliff:g> nalog"</string>

    <string name="take_photo" msgid="820071555236547516">"Slikaj"</string>
@@ -336,15 +336,15 @@ 
    <string name="map_work" msgid="8296916987749726461">"Prikaži poslovnu adresu"</string>

    <string name="map_other" msgid="4009931029322619674">"Prikaži adresu"</string>

    <string name="map_custom" msgid="7797812861927817335">"Prikaži adresu <xliff:g id="CUSTOM_LABEL">%s</xliff:g>"</string>

    <string name="chat_aim" msgid="2044861410748519265">"Započni ćaskanje preko AIM-a"</string>

    <string name="chat_msn" msgid="4733206223124506247">"Započni ćaskanje preko Windows Live-a"</string>

    <string name="chat_yahoo" msgid="3807571878191282528">"Započni ćaskanje preko Yahoo-a"</string>

    <string name="chat_skype" msgid="5130564346825936093">"Započni ćaskanje preko Skype-a"</string>

    <string name="chat_qq" msgid="2971335421266098608">"Započni ćaskanje preko QQ-a"</string>

    <string name="chat_gtalk" msgid="2927882858741904064">"Ćaskaj preko Google Talk-a"</string>

    <string name="chat_icq" msgid="4289041376069626281">"Započni ćaskanje preko ICQ-a"</string>

    <string name="chat_jabber" msgid="1097960594943864847">"Započni ćaskanje preko Jabber-a"</string>

    <string name="chat" msgid="8390862712584830532">"Ćaskanje"</string>

    <string name="chat_aim" msgid="2044861410748519265">"Započni čet preko AIM-a"</string>

    <string name="chat_msn" msgid="4733206223124506247">"Započni čet preko Windows Live-a"</string>

    <string name="chat_yahoo" msgid="3807571878191282528">"Započni čet preko Yahoo-a"</string>

    <string name="chat_skype" msgid="5130564346825936093">"Započni čet preko Skype-a"</string>

    <string name="chat_qq" msgid="2971335421266098608">"Započni čet preko QQ-a"</string>

    <string name="chat_gtalk" msgid="2927882858741904064">"Četuj preko Google Talk-a"</string>

    <string name="chat_icq" msgid="4289041376069626281">"Započni čet preko ICQ-a"</string>

    <string name="chat_jabber" msgid="1097960594943864847">"Započni čet preko Jabber-a"</string>

    <string name="chat" msgid="8390862712584830532">"Čet"</string>

    <string name="description_minus_button" msgid="1305985971158054217">"izbriši"</string>

    <string name="expand_name_fields_description" msgid="6059558159338959487">"Prikažite još polja za ime"</string>

    <string name="collapse_name_fields_description" msgid="7950435675716414477">"Skupite polja za ime"</string>

res/values-bn/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
    <string name="shortcut_add_contact" msgid="7949342235528657981">"পরিচিতি যোগ করুন"</string>

    <string name="shortcutContact" msgid="8009736387364461511">"পরিচিতি"</string>

    <string name="shortcutDialContact" msgid="155367248069127153">"সরাসরি ডায়াল"</string>

    <string name="shortcutMessageContact" msgid="9123517151981679277">"সরাসরি বার্তা"</string>

    <string name="shortcutMessageContact" msgid="9123517151981679277">"সরাসরি মেসেজ"</string>

    <string name="shortcutActivityTitle" msgid="5407832911005090417">"পরিচিতি বেছে নিন"</string>

    <string name="contactInsertOrEditActivityTitle" msgid="1788154962629911262">"পরিচিতিতে যোগ করুন"</string>

    <string name="contactPickerActivityTitle" msgid="1842634991247618890">"একটি পরিচিতি বেছে নিন"</string>

res/values-eu/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ 
    <string name="contactsList" msgid="4456188358262700898">"Kontaktuak"</string>

    <string name="shortcut_add_contact" msgid="7949342235528657981">"Gehitu kontaktua"</string>

    <string name="shortcutContact" msgid="8009736387364461511">"Kontaktua"</string>

    <string name="shortcutDialContact" msgid="155367248069127153">"Markatze zuzena"</string>

    <string name="shortcutMessageContact" msgid="9123517151981679277">"Mezu zuzena"</string>

    <string name="shortcutDialContact" msgid="155367248069127153">"Zuzeneko markatzea"</string>

    <string name="shortcutMessageContact" msgid="9123517151981679277">"Zuzeneko mezua"</string>

    <string name="shortcutActivityTitle" msgid="5407832911005090417">"Aukeratu kontaktua"</string>

    <string name="contactInsertOrEditActivityTitle" msgid="1788154962629911262">"Gehitu kontaktu batean"</string>

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