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

Commit e25e4ac0 authored by Amit Kumar's avatar Amit Kumar 💻
Browse files

Merge branch 'revert-9921b345' into 'v1-pie' 

Revert "Merge branch 'issue_1828' into 'v1-pie'"

See merge request !39
parents 9921b345 91afb379

AndroidManifest.xml

+0 −1
Original line number Diff line number Diff line
@@ -71,7 +71,6 @@ 
        android:appCategory="social"

        android:supportsRtl="true"

        android:taskAffinity="android.task.contacts"



        android:usesCleartextTraffic="false">

        <!-- The main Contacts activity with the contact list, favorites, and groups. -->

        <activity

res/drawable/fab_bg.xml

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

<shape

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:shape="oval">



    <solid

        android:color="#ffffff"/>



    <size

        android:width="120dp"

        android:height="120dp"/>

</shape>
 
 No newline at end of file

res/drawable/ic_work_profile.xml

+1 −2
Original line number Diff line number Diff line
@@ -2,8 +2,7 @@ 
        android:width="16dp"

        android:height="16dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0"

    >

        android:viewportHeight="24.0">

    <path

        android:pathData="M20,6h-4V4c0,-1.11 -0.89,-2 -2,-2h-4C8.89,2 8,2.89 8,4v2H4C2.89,6 2.01,6.89 2.01,8L2,19c0,1.11 0.89,2 2,2h16c1.11,0 2,-0.89 2,-2V8C22,6.89 21.11,6 20,6zM12,15c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2s2,0.9 2,2S13.1,15 12,15zM14,6h-4V4h4V6z"

        android:fillColor="#7F7F7F"/>

res/drawable/quantum_ic_add_vd_theme_24.xml

+1 −1
Original line number Diff line number Diff line
@@ -21,6 +21,6 @@ 
        android:viewportHeight="24.0"

        android:tint="?attr/colorControlNormal">

    <path

        android:fillColor="@color/color_default_blue1"

        android:fillColor="@android:color/white"

        android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>

</vector>

res/drawable/quantum_ic_close_vd_theme_24.xml

+1 −1
Original line number Diff line number Diff line
@@ -21,6 +21,6 @@ 
        android:viewportHeight="24.0"

        android:tint="?attr/colorControlNormal">

    <path

        android:fillColor="@color/color_default_blue1"

        android:fillColor="@android:color/white"

        android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>

</vector>