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

Unverified Commit 48ca04e2 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-16.0.0_r1' into lineage-23.0 

Android 16.0.0 release 1

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCaEhhEwAKCRDorT+BmrEO
# eOtUAJ9lOo6kIxb0iS5LfCSAJU1t8L4LKACfftEX31uuenyX3Tz7249Zv85V/cY=
# =MuJb
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue Jun 10 19:45:07 2025 EEST
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [ultimate]

# By Bill Yi (12) and others
# Via Android Build Coastguard Worker (32) and others
* tag 'android-16.0.0_r1':
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Revert "Use CP2 for default account setting in AOSP."
  packages/apps/Contacts: remove deprecated Mockito usages
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  [owners] Remove yaolu@google.com from OWNERS
  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
  Explicitly keep default constructor in rules without members
  Import translations. DO NOT MERGE ANYWHERE
  Contacts: Fix display wrong SIM contact name
  Import translations. DO NOT MERGE ANYWHERE

Change-Id: I91f041407431c93c78cb279ae199859d49b6f080
parents 15fd96e6 7f98a802

AndroidManifest.xml

+0 −11
Original line number Diff line number Diff line
@@ -264,17 +264,6 @@ 
            android:launchMode="singleTop"

            android:theme="@style/ContactsPreferencesTheme"/>



        <activity

            android:name=".preference.SetDefaultAccountActivity"

            android:exported="true"

            android:theme="@style/BackgroundOnlyTheme"

            android:excludeFromRecents="true">

            <intent-filter>

                <action android:name="android.provider.action.SET_DEFAULT_ACCOUNT"/>

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

            </intent-filter>

        </activity>



        <activity

            android:name=".activities.LicenseActivity"

            android:exported="true"

OWNERS

+0 −1
Original line number Diff line number Diff line
@@ -4,4 +4,3 @@ garymai@google.com 
mhagerott@google.com

wjang@google.com

johnshao@google.com
 
yaolu@google.com

proguard.flags

+9 −3
Original line number Diff line number Diff line
@@ -107,13 +107,19 @@ 
-keep class com.android.common.widget.CompositeCursorAdapter { *; }



# Any class or method annotated with NeededForReflection.

-keep @com.android.contacts.test.NeededForReflection class *

# TODO(b/373579455): Evaluate if <init> needs to be kept.

-keep @com.android.contacts.test.NeededForReflection class * {

  void <init>();

}

-keepclassmembers class * {

  @com.android.contacts.test.NeededForReflection *;

}



# Keep classes and methods that have the guava @VisibleForTesting annotation

-keep @com.google.common.annotations.VisibleForTesting class *

# TODO(b/373579455): Evaluate if <init> needs to be kept.

-keep @com.google.common.annotations.VisibleForTesting class * {

  void <init>();

}

-keepclassmembers class * {

  @com.google.common.annotations.VisibleForTesting *;

}

res/values-ar/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ 
    <string name="groupSomeContactsNoPhonesToast" msgid="2454029254458875746">"بعض جهات الاتصال ليست لديها أرقام هواتف."</string>

    <string name="menu_sendEmailOption" msgid="8600335923636486825">"إرسال رسالة إلكترونية"</string>

    <string name="menu_sendMessageOption" msgid="8051852013078110910">"إرسال رسالة"</string>

    <string name="pickerSelectContactsActivityTitle" msgid="8265907544009447967">"اختيار جهات الاتصال"</string>

    <string name="pickerSelectContactsActivityTitle" msgid="8265907544009447967">"يُرجى اختيار جهات الاتصال"</string>

    <string name="send_to_selection" msgid="3655197947726443720">"إرسال"</string>

    <string name="listFoundAllContactsZero" msgid="1933842282916988563">"ليست هناك جهات اتصال"</string>

    <string name="add_contact_dlg_message_fmt" msgid="7498024710169591375">"هل ترغب في إضافة \"<xliff:g id="EMAIL">%s</xliff:g>\" إلى جهات الاتصال؟"</string>

res/values-bn/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
    <string name="menu_renameGroup" msgid="2685886609399776475">"লেবেলের পুনঃনামকরণ করুন"</string>

    <string name="menu_deleteGroup" msgid="1180215594530228294">"লেবেল মুছুন"</string>

    <string name="menu_addToGroup" msgid="5034813446697655310">"পরিচিতি যোগ করুন"</string>

    <string name="menu_selectForGroup" msgid="6386553337569514850">"পরিচিতিগুলিকে বেছে নিন"</string>

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

    <string name="menu_addContactsToGroup" msgid="4549318978482280577">"পরিচিতিগুলি যোগ করুন"</string>

    <string name="menu_removeFromGroup" msgid="8753799091967887958">"লেবেল থেকে সরান"</string>

    <string name="menu_new_group_action_bar" msgid="1670312283925872483">"লেবেল তৈরি করুন"</string>