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

Commit 424f2276 authored by Sumit Pundir's avatar Sumit Pundir
Browse files

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

parents 94d0235d f4b3f273

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 


    <uses-sdk

        android:minSdkVersion="26"

        android:targetSdkVersion="28"/>

        android:targetSdkVersion="29"/>



    <original-package android:name="com.android.contacts"/>

res/layout/contact_list_content.xml

+1 −0
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ 
                android:paddingTop="?attr/list_item_padding_top"

                android:clipToPadding="false"

                android:fastScrollEnabled="true"

                android:forceDarkAllowed="false"

		android:visibility="gone"

                android:fadingEdge="none" />

        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>

res/layout/contact_picker_content.xml

+2 −1
Original line number Diff line number Diff line
@@ -31,7 +31,8 @@ 
        android:layout_marginEnd="?attr/contact_browser_list_padding_right"

        android:paddingTop="@dimen/contact_browser_list_item_padding_top_or_bottom"

        android:clipToPadding="false"

        android:fastScrollEnabled="true"/>

        android:fastScrollEnabled="true"

        android:forceDarkAllowed="false"/>



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

              android:layout_width="wrap_content"

res/layout/join_contact_picker_list_content.xml

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ 
            android:layout_marginStart="?attr/contact_browser_list_padding_left"

            android:layout_marginEnd="?attr/contact_browser_list_padding_right"

            android:fastScrollEnabled="true"

            android:forceDarkAllowed="false"

            android:scrollbarStyle="outsideOverlay" />

    </FrameLayout>

</LinearLayout>

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>