Merge branch 'lineage-21.0' of https://github.com/LineageOS/android_packages_apps_Contacts into leaf-3.2
Change-Id: I405a850af7848aa5cb797bd92bb246502f456045
diff --git a/res/drawable/ic_launcher_background.xml b/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index fc48230..0000000
--- a/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- SPDX-FileCopyrightText: 2022 The LineageOS Project
- SPDX-License-Identifier: Apache-2.0
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="108dp"
- android:height="108dp"
- android:viewportWidth="108"
- android:viewportHeight="108">
- <path
- android:pathData="M0,0h108v108h-108z"
- android:fillColor="#ffffff"/>
- <path
- android:pathData="M77,51C77,59.837 70,63 61,63C52,63 45,59.837 45,51C45,38.163 52,31 61,31C70,31 77,38.163 77,51Z"
- android:fillColor="#4D84E9"/>
- <path
- android:pathData="M71,49C68.569,50.255 64.821,51 61,51C57.179,51 53.431,50.255 51,49C52.093,52.47 54.333,57 61,57C67.667,57 69.907,52.47 71,49Z"
- android:fillColor="#ffffff"/>
-</vector>
diff --git a/res/drawable/ic_launcher_foreground.xml b/res/drawable/ic_launcher_foreground.xml
deleted file mode 100644
index 686ffa2..0000000
--- a/res/drawable/ic_launcher_foreground.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- SPDX-FileCopyrightText: 2022 The LineageOS Project
- SPDX-License-Identifier: Apache-2.0
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:aapt="http://schemas.android.com/aapt"
- android:width="108dp"
- android:height="108dp"
- android:viewportWidth="108"
- android:viewportHeight="108">
- <group>
- <clip-path
- android:pathData="M0,0h108v108h-108z"/>
- <path
- android:pathData="M64,64C64,72.837 57,76 48,76C39,76 32,72.837 32,64C32,51.163 39,44 48,44C57,44 64,51.163 64,64Z"
- android:fillColor="#193057"/>
- <path
- android:pathData="M58,62C55.569,63.255 51.821,64 48,64C44.179,64 40.431,63.255 38,62C39.093,65.47 41.333,70 48,70C54.667,70 56.907,65.47 58,62Z"
- android:fillColor="#ffffff"/>
- <path
- android:pathData="M28.54,28.54m-72,0a72,72 0,1 1,144 0a72,72 0,1 1,-144 0"
- android:fillAlpha="0.6">
- <aapt:attr name="android:fillColor">
- <gradient
- android:gradientRadius="72"
- android:centerX="28.54"
- android:centerY="28.54"
- android:type="radial">
- <item android:offset="0" android:color="#19FFFFFF"/>
- <item android:offset="1" android:color="#00FFFFFF"/>
- </gradient>
- </aapt:attr>
- </path>
- </group>
-</vector>
diff --git a/res/drawable/ic_launcher_monochrome.xml b/res/drawable/ic_launcher_monochrome.xml
deleted file mode 100644
index fc64ec0..0000000
--- a/res/drawable/ic_launcher_monochrome.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- SPDX-FileCopyrightText: 2022 The LineageOS Project
- SPDX-License-Identifier: Apache-2.0
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="108dp"
- android:height="108dp"
- android:viewportWidth="108"
- android:viewportHeight="108">
- <path
- android:pathData="M70.724,57.809C72.696,56.509 74,54.485 74,51C74,45.112 72.398,40.856 70.086,38.125C67.803,35.43 64.654,34 61,34C57.346,34 54.197,35.43 51.915,38.125C51.199,38.97 50.551,39.962 49.998,41.102C49.341,41.034 48.674,41 48,41C47.579,41 47.161,41.013 46.747,41.04C49.369,34.518 54.693,31 61,31C70,31 77,38.163 77,51C77,57.753 72.912,61.193 66.967,62.439C66.924,61.405 66.836,60.4 66.706,59.425C68.305,59.057 69.654,58.515 70.724,57.809ZM64.076,50.84C64.882,52.37 65.53,54.051 66.009,55.867C68.942,54.302 70.245,51.398 71,49C69.23,49.914 66.762,50.557 64.076,50.84Z"
- android:fillColor="#ffffffff"
- android:fillType="evenOdd"/>
- <path
- android:pathData="M48,76C57,76 64,72.837 64,64C64,51.163 57,44 48,44C39,44 32,51.163 32,64C32,72.837 39,76 48,76ZM48,64C51.821,64 55.569,63.255 58,62C56.907,65.47 54.667,70 48,70C41.333,70 39.093,65.47 38,62C40.431,63.255 44.179,64 48,64Z"
- android:fillColor="#ffffffff"
- android:fillType="evenOdd"/>
-</vector>
diff --git a/res/drawable/ic_monochrome.xml b/res/drawable/ic_monochrome.xml
new file mode 100644
index 0000000..808ac99
--- /dev/null
+++ b/res/drawable/ic_monochrome.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="108.0dip" android:width="108.0dip" android:viewportWidth="108.0" android:viewportHeight="108.0"
+ xmlns:android="http://schemas.android.com/apk/res/android">
+ <path android:fillColor="#ff000000" android:pathData="M35.598,72.402C36.774,73.578 38.203,74.167 39.883,74.167H68.117C69.797,74.167 71.226,73.578 72.402,72.402C73.578,71.226 74.167,69.797 74.167,68.117V65.218C74.167,63.621 73.558,62.141 72.339,60.776C71.121,59.41 69.545,58.222 67.613,57.214C65.68,56.206 63.495,55.417 61.058,54.849C58.621,54.283 56.185,54 53.748,54C51.311,54 48.906,54.283 46.533,54.849C44.159,55.417 42.026,56.195 40.135,57.181C38.245,58.169 36.722,59.346 35.568,60.71C34.411,62.077 33.833,63.558 33.833,65.155V68.117C33.833,69.797 34.422,71.226 35.598,72.402Z" />
+ <path android:fillColor="#ff000000" android:pathData="M47.417,48.895C49.14,50.618 51.22,51.479 53.656,51.479C56.093,51.479 58.173,50.618 59.895,48.895C61.618,47.173 62.479,45.093 62.479,42.656C62.479,40.219 61.628,38.14 59.926,36.417C58.225,34.694 56.135,33.833 53.656,33.833C51.22,33.833 49.14,34.694 47.417,36.417C45.695,38.14 44.833,40.219 44.833,42.656C44.833,45.093 45.695,47.173 47.417,48.895Z" />
+</vector>
diff --git a/res/mipmap-anydpi/ic_launcher.xml b/res/mipmap-anydpi/ic_launcher.xml
index b58c81f..c8b5591 100644
--- a/res/mipmap-anydpi/ic_launcher.xml
+++ b/res/mipmap-anydpi/ic_launcher.xml
@@ -1,10 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
-<!--
- SPDX-FileCopyrightText: 2022 The LineageOS Project
- SPDX-License-Identifier: Apache-2.0
+<!-- 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="@drawable/ic_launcher_background"/>
- <foreground android:drawable="@drawable/ic_launcher_foreground"/>
- <monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
+ <background android:drawable="@mipmap/ic_background"/>
+ <foreground android:drawable="@mipmap/ic_foreground"/>
+ <monochrome android:drawable="@drawable/ic_monochrome" />
</adaptive-icon>
+
diff --git a/res/mipmap-hdpi/ic_background.png b/res/mipmap-hdpi/ic_background.png
new file mode 100644
index 0000000..e3d7036
--- /dev/null
+++ b/res/mipmap-hdpi/ic_background.png
Binary files differ
diff --git a/res/mipmap-hdpi/ic_foreground.png b/res/mipmap-hdpi/ic_foreground.png
new file mode 100644
index 0000000..8de9350
--- /dev/null
+++ b/res/mipmap-hdpi/ic_foreground.png
Binary files differ
diff --git a/res/mipmap-mdpi/ic_background.png b/res/mipmap-mdpi/ic_background.png
new file mode 100644
index 0000000..9cf4aa9
--- /dev/null
+++ b/res/mipmap-mdpi/ic_background.png
Binary files differ
diff --git a/res/mipmap-mdpi/ic_foreground.png b/res/mipmap-mdpi/ic_foreground.png
new file mode 100644
index 0000000..3cabd62
--- /dev/null
+++ b/res/mipmap-mdpi/ic_foreground.png
Binary files differ
diff --git a/res/mipmap-xhdpi/ic_background.png b/res/mipmap-xhdpi/ic_background.png
new file mode 100644
index 0000000..83d721f
--- /dev/null
+++ b/res/mipmap-xhdpi/ic_background.png
Binary files differ
diff --git a/res/mipmap-xhdpi/ic_foreground.png b/res/mipmap-xhdpi/ic_foreground.png
new file mode 100644
index 0000000..9de308a
--- /dev/null
+++ b/res/mipmap-xhdpi/ic_foreground.png
Binary files differ
diff --git a/res/mipmap-xxhdpi/ic_background.png b/res/mipmap-xxhdpi/ic_background.png
new file mode 100644
index 0000000..ac28291
--- /dev/null
+++ b/res/mipmap-xxhdpi/ic_background.png
Binary files differ
diff --git a/res/mipmap-xxhdpi/ic_foreground.png b/res/mipmap-xxhdpi/ic_foreground.png
new file mode 100644
index 0000000..aae300c
--- /dev/null
+++ b/res/mipmap-xxhdpi/ic_foreground.png
Binary files differ
diff --git a/res/mipmap-xxxhdpi/ic_background.png b/res/mipmap-xxxhdpi/ic_background.png
new file mode 100644
index 0000000..ef949ad
--- /dev/null
+++ b/res/mipmap-xxxhdpi/ic_background.png
Binary files differ
diff --git a/res/mipmap-xxxhdpi/ic_foreground.png b/res/mipmap-xxxhdpi/ic_foreground.png
new file mode 100644
index 0000000..74f8590
--- /dev/null
+++ b/res/mipmap-xxxhdpi/ic_foreground.png
Binary files differ
