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

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

Merge tag 'android-14.0.0_r50' into staging/lineage-21.0_merge-android-14.0.0_r50 

Android 14.0.0 Release 50 (AP2A.240605.024)

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZmdzpgAKCRDorT+BmrEO
# eCa4AJ9SmR95oYqsQOdeej1x5Xy9oUmhIwCfRT779cg1ojwL8Vb1FMabjUVD1xg=
# =QeIl
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue Jun 11 00:44:06 2024 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 2499 signatures in the past
#      2 years.  Encrypted 4 messages in the past 2 years.
# 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 (27) and others
# Via Automerger Merge Worker (24) and others
* tag 'android-14.0.0_r50': (31 commits)
  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
  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
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Move Im and SipAddress to legacy field
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Baseline NewApi issues
  ...

 Conflicts:
	res/values/ids.xml

Change-Id: If5eda69021478c41ab67fca7505f7090e3fca6a9
parents 0dd8e71b fd7d77cb

lint-baseline.xml

deleted100644 → 0
+0 −664

File deleted.

Preview size limit exceeded, changes collapsed.

res/layout/contact_editor_fields.xml

+25 −0
Original line number Diff line number Diff line
@@ -48,4 +48,29 @@ 


    </LinearLayout>



    <LinearLayout

        android:id="@+id/legacy_fields_container"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginTop="8dp"

        android:orientation="vertical"

        android:visibility="gone">

        <TextView

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:textAllCaps="true"

            android:layout_marginStart="16dp"

            android:textAppearance="?attr/textAppearanceOverline"

            android:singleLine="true"

            android:layout_marginBottom="24dp"

            android:textSize="11sp"

            android:text="@string/editor_uneditable_section_title" />



        <LinearLayout

            android:id="@+id/legacy_section_views"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="vertical" />

    </LinearLayout>



</merge>
 
 No newline at end of file

res/values-af/strings.xml

+1 −0
Original line number Diff line number Diff line
@@ -144,6 +144,7 @@ 
    <string name="search_results_searching" msgid="1373859095361975648">"Soek tans…"</string>

    <string name="event_edit_field_hint_text" msgid="1720286136507504896">"Datum"</string>

    <string name="group_edit_field_hint_text" msgid="1159504474053684478">"Etiket"</string>

    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"Kan nie hierdie inligting opdateer nie"</string>

    <string name="cancel_button_content_description" msgid="7407595608883650004">"Kanselleer"</string>

    <string name="back_arrow_content_description" msgid="6727142616775523605">"Terug"</string>

    <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"maak toe"</string>

res/values-am/strings.xml

+1 −0
Original line number Diff line number Diff line
@@ -144,6 +144,7 @@ 
    <string name="search_results_searching" msgid="1373859095361975648">"በመፈለግ ላይ…"</string>

    <string name="event_edit_field_hint_text" msgid="1720286136507504896">"ቀን"</string>

    <string name="group_edit_field_hint_text" msgid="1159504474053684478">"መሰየሚያ"</string>

    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"ይህን መረጃ ማዘመን አልተቻለም"</string>

    <string name="cancel_button_content_description" msgid="7407595608883650004">"ይቅር"</string>

    <string name="back_arrow_content_description" msgid="6727142616775523605">"ተመለስ"</string>

    <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"ዝጋ"</string>

res/values-ar/strings.xml

+1 −0
Original line number Diff line number Diff line
@@ -144,6 +144,7 @@ 
    <string name="search_results_searching" msgid="1373859095361975648">"جارٍ البحث..."</string>

    <string name="event_edit_field_hint_text" msgid="1720286136507504896">"التاريخ"</string>

    <string name="group_edit_field_hint_text" msgid="1159504474053684478">"التصنيف"</string>

    <string name="editor_uneditable_section_title" msgid="4022820593578859556">"لا يمكن تعديل هذه المعلومات"</string>

    <string name="cancel_button_content_description" msgid="7407595608883650004">"إلغاء"</string>

    <string name="back_arrow_content_description" msgid="6727142616775523605">"رجوع"</string>

    <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"إغلاق"</string>