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

Commit c4d16b31 authored by Bill Yi's avatar Bill Yi
Browse files

Merge stage-aosp-master to aosp-master - DO NOT MERGE 

Change-Id: I5c48933fa38245a560d924b9c0c18a12b6cd04b6
parents e721c022 37e4af54

Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -39,6 +39,8 @@ java_defaults { 
    sdk_version: "system_current",

    min_sdk_version: "28",

    target_sdk_version: "28",



    plugins: ["java_api_finder"],

}



filegroup {

res/layout/item_doc_inflated_message.xml

+10 −12
Original line number Diff line number Diff line
@@ -18,34 +18,32 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@android:id/empty"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout_height="wrap_content"

    android:background="?android:attr/colorBackground"

    android:focusable="true">



    <RelativeLayout

    <LinearLayout

        android:id="@+id/content"

        android:layout_width="match_parent"

        android:layout_height="match_parent">

        android:layout_height="wrap_content"

        android:orientation="vertical">



        <ImageView

            android:id="@+id/artwork"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_width="fill_parent"

            android:layout_alignParentTop="true"

            android:layout_marginBottom="25dp"

            android:scaleType="fitCenter"

            android:maxHeight="250dp"

            android:adjustViewBounds="true"

            android:contentDescription="@null"/>



        <TextView

            android:id="@+id/message"

            android:layout_width="wrap_content"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_below="@+id/artwork"

            android:layout_centerHorizontal="true"

            android:layout_marginBottom="25dp"

            android:gravity="center_horizontal"

            style="?android:attr/textAppearanceListItem"/>



    </RelativeLayout>



    </LinearLayout>

</FrameLayout>
 
 No newline at end of file

res/values-af/inspector_strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -44,4 +44,6 @@ 
    <string name="metadata_composer" msgid="4696926808308256056">"Komponis"</string>

    <string name="metadata_album" msgid="1661699531214720236">"Album"</string>

    <string name="metadata_address" msgid="1849921023707744640">"Ligging"</string>

    <string name="debug_stream_types" msgid="2088565280360139333">"Stroomtipes"</string>

    <string name="debug_raw_size" msgid="7487139640175650185">"Onverwerkte grootte (grepe)"</string>

</resources>

res/values-af/strings.xml

+1 −2
Original line number Diff line number Diff line
@@ -243,8 +243,7 @@ 
    <string name="apps_row_title" msgid="3340490016663092925">"Blaai deur lêers in ander programme"</string>

    <string name="anonymous_application" msgid="7633027057951625862">"Anoniem"</string>

    <string name="open_tree_button" msgid="19992834788135845">"Gee toegang tot \"<xliff:g id="DIRECTORY">%1$s</xliff:g>\""</string>

    <string name="open_tree_dialog_title" msgid="8429465292253532274">"Laat toegang tot \"<xliff:g id="DIRECTORY">%1$s</xliff:g>\" toe in \"<xliff:g id="ROOT">%2$s</xliff:g>\"?"</string>

    <string name="open_tree_dialog_title" msgid="6978383241897450134">"Gee toegang tot \"<xliff:g id="DIRECTORY">%1$s</xliff:g>\" op \"<xliff:g id="ROOT">%2$s</xliff:g>\"?"</string>

    <string name="open_tree_dialog_message" msgid="8545093618524340168">"Dit sal \"<xliff:g id="APPNAME">%1$s</xliff:g>\" volle toegang gee tot alle lêers wat tans onder hierdie ligging geberg word, asook enige toekomstige inhoud wat hier geberg word."</string>

    <string name="search_bar_hint" msgid="4517366509897977321">"Deursoek hierdie foon"</string>

    <string name="delete_search_history" msgid="2202015025607694515">"Vee soekgeskiedenis uit: <xliff:g id="TEXT">%1$s</xliff:g>"</string>

</resources>

res/values-am/inspector_strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -44,4 +44,6 @@ 
    <string name="metadata_composer" msgid="4696926808308256056">"የሙዚቃ ደራሲ"</string>

    <string name="metadata_album" msgid="1661699531214720236">"አልበም"</string>

    <string name="metadata_address" msgid="1849921023707744640">"አካባቢ"</string>

    <string name="debug_stream_types" msgid="2088565280360139333">"የዥረት አይነቶች"</string>

    <string name="debug_raw_size" msgid="7487139640175650185">"የጥሬ መጠን (ባይት)"</string>

</resources>