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

Commit ad723a1d authored by /e/ robot's avatar /e/ robot
Browse files

Merge remote-tracking branch 'origin/lineage-17.1' into v1-q

parents e37eb835 700d64ca

Android.bp

+3 −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 {
@@ -83,6 +85,7 @@ android_library { 


    min_sdk_version: "28",

    target_sdk_version: "28",

    sdk_version: "system_current",

}



android_app {

perf-tests/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ android_test { 


    static_libs: [

        "androidx.legacy_legacy-support-v4",

        "androidx.test.rules",

        "androidx.test.espresso.core",

        "mockito-target",

        "ub-janktesthelper",

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/mipmap-anydpi/ic_launcher.xml

0 → 100644
+20 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (c) 2018 The LineageOS Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



         http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">

    <background android:drawable="@mipmap/ic_background"/>

    <foreground android:drawable="@mipmap/ic_foreground"/>

</adaptive-icon>

res/mipmap-hdpi/ic_background.png

0 → 100644
+1.1 KiB
Loading image diff...