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

Commit 272d7c02 authored by Xin Li's avatar Xin Li Committed by Gerrit Code Review
Browse files

Merge "Merge Android 14 QPR3 to AOSP main" into main

parents 1c66c576 ec5b7973

Android.bp

+0 −3
Original line number Diff line number Diff line
@@ -57,7 +57,4 @@ android_app { 


    sdk_version: "system_current",

    min_sdk_version: "21",

    lint: {

        baseline_filename: "lint-baseline.xml",

    },

}

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>