Merge branch 'lineage-21.0' of https://github.com/LineageOS/android_packages_apps_Messaging into leaf-3.2
Change-Id: I112bf51c103203670763827aa7454b6f415758f9
diff --git a/res/drawable-hdpi/ic_failed_light.png b/res/drawable-hdpi/ic_failed_light.png
new file mode 100644
index 0000000..3614fbe
--- /dev/null
+++ b/res/drawable-hdpi/ic_failed_light.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_failed_light.png b/res/drawable-mdpi/ic_failed_light.png
new file mode 100644
index 0000000..02a4d0b
--- /dev/null
+++ b/res/drawable-mdpi/ic_failed_light.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_failed_light.png b/res/drawable-xhdpi/ic_failed_light.png
new file mode 100644
index 0000000..33d3436
--- /dev/null
+++ b/res/drawable-xhdpi/ic_failed_light.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_failed_light.png b/res/drawable-xxhdpi/ic_failed_light.png
new file mode 100644
index 0000000..7612138
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_failed_light.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_failed_light.png b/res/drawable-xxxhdpi/ic_failed_light.png
new file mode 100644
index 0000000..53d374c
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_failed_light.png
Binary files differ
diff --git a/res/drawable/ic_failed_light.xml b/res/drawable/ic_failed_light.xml
deleted file mode 100644
index c322be3..0000000
--- a/res/drawable/ic_failed_light.xml
+++ /dev/null
@@ -1,15 +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="24dp"
- android:height="24dp"
- android:viewportWidth="24"
- android:viewportHeight="24">
- <path
- android:pathData="M22,12C22,17.5228 17.5228,22 12,22C6.4771,22 2,17.5228 2,12C2,6.4771 6.4771,2 12,2C13.6465,2 15.2001,2.3979 16.5698,3.1029L20.8695,2.028C21.5353,1.8615 22.1384,2.4646 21.972,3.1304L20.8971,7.4301C21.602,8.7998 22,10.3534 22,12ZM15.74,17L17,15.74L13.26,12L17,8.26L15.74,7L12,10.74L8.26,7L7,8.26L10.74,12L7,15.74L8.26,17L12,13.26L15.74,17Z"
- android:fillColor="#000000"
- android:fillType="evenOdd"/>
-</vector>
diff --git a/res/drawable/ic_launcher_background.xml b/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index fb36b7e..0000000
--- a/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,18 +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="#359944"/>
- <path
- android:pathData="M54,76C66.15,76 76,66.15 76,54C76,49.769 74.806,45.817 72.736,42.463L74.327,36.098C74.693,34.634 73.366,33.307 71.902,33.673L65.537,35.264C62.183,33.194 58.231,32 54,32C41.85,32 32,41.85 32,54C32,66.15 41.85,76 54,76Z"
- android:fillColor="#ffffff"
- android:fillType="evenOdd"/>
-</vector>
diff --git a/res/drawable/ic_launcher_foreground.xml b/res/drawable/ic_launcher_foreground.xml
deleted file mode 100644
index d0dcbf4..0000000
--- a/res/drawable/ic_launcher_foreground.xml
+++ /dev/null
@@ -1,34 +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="M54,66C60.75,66 66,63.627 66,57C66,47.373 60.75,42 54,42C47.25,42 42,47.373 42,57C42,63.627 47.25,66 54,66ZM54,57.5C57.057,57.5 60.055,56.942 62,56C61.125,58.603 59.333,62 54,62C48.667,62 46.875,58.603 46,56C47.945,56.942 50.943,57.5 54,57.5Z"
- android:fillColor="#143721"
- android:fillType="evenOdd"/>
- <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 9cf5e2c..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="M69.465,42.887L70.916,37.083L65.113,38.534L64.033,37.861C61.123,36.048 57.688,35 54,35C43.507,35 35,43.507 35,54C35,64.493 43.507,73 54,73C64.493,73 73,64.493 73,54C73,50.311 71.952,46.876 70.138,43.966L69.465,42.887ZM76,54C76,66.15 66.15,76 54,76C41.85,76 32,66.15 32,54C32,41.85 41.85,32 54,32C58.265,32 62.248,33.214 65.619,35.315L71.805,33.769C73.27,33.403 74.597,34.729 74.23,36.194L72.684,42.38C74.786,45.752 76,49.734 76,54Z"
- android:fillColor="#ffffffff"
- android:fillType="evenOdd"/>
- <path
- android:pathData="M54,65.733C60.6,65.733 65.733,63.414 65.733,56.933C65.733,47.52 60.6,42.267 54,42.267C47.4,42.267 42.267,47.52 42.267,56.933C42.267,63.414 47.4,65.733 54,65.733ZM54,56.933C56.802,56.933 59.551,56.387 61.333,55.467C60.532,58.012 58.889,61.333 54,61.333C49.111,61.333 47.468,58.012 46.667,55.467C48.449,56.387 51.198,56.933 54,56.933Z"
- 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..ffa366f
--- /dev/null
+++ b/res/drawable/ic_monochrome.xml
@@ -0,0 +1,41 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
+ android:viewportWidth="432"
+ android:viewportHeight="432"
+ android:width="108dp"
+ android:height="108dp">
+ <path
+ android:pathData="M149.5 139L282.5 139Q289.4 140.6 292 146.5L293 149.5L293 251.5L286.5 261L282.5 263L170.5 263L168 264L168 265.5L145.5 288Q143.3 287.3 144 289.5L139 293L139 149.5Q140.6 142.6 146.5 140L149.5 139ZM151 140L148 141Q142 144 140 151L141 291L170 262L280 262L285 260L292 251L292 151L291 148Q288 142 282 140L151 140Z"
+ android:fillColor="#FEFEFE"
+ android:fillAlpha="0.6862745"
+ android:strokeColor="#FEFEFE"
+ android:strokeAlpha="0.6862745"
+ android:strokeWidth="1" />
+ <path
+ android:pathData="M170.5 185L262 185.5L170.5 186L170.5 185Z"
+ android:fillColor="#FEFEFE"
+ android:fillAlpha="0.6862745"
+ android:strokeColor="#FEFEFE"
+ android:strokeAlpha="0.6862745"
+ android:strokeWidth="1" />
+ <path
+ android:pathData="M170.5 208L262 208.5L170.5 209L170.5 208Z"
+ android:fillColor="#FEFEFE"
+ android:fillAlpha="0.6862745"
+ android:strokeColor="#FEFEFE"
+ android:strokeAlpha="0.6862745"
+ android:strokeWidth="1" />
+ <path
+ android:pathData="M170.5 231L262 231.5L170.5 232L170.5 231Z"
+ android:fillColor="#FEFEFE"
+ android:fillAlpha="0.6862745"
+ android:strokeColor="#FEFEFE"
+ android:strokeAlpha="0.6862745"
+ android:strokeWidth="1" />
+ <path
+ android:pathData="M150.5 140L281.5 140Q288.4 141.6 291 147.5L292 150.5L292 250.5L284.5 260L279.5 262L169.5 262L140.5 291L140 150.5Q141.6 143.6 147.5 141L150.5 140ZM170 170L170 186L171 186L262 186L262 171L262 170L170 170ZM170 193L170 209L171 209L262 209L262 194L262 193L170 193ZM170 216L170 232L171 232L262 232L262 217L262 216L170 216Z"
+ android:fillColor="#FEFEFE"
+ android:fillAlpha="0.9960784"
+ android:strokeColor="#FEFEFE"
+ android:strokeAlpha="0.9960784"
+ android:strokeWidth="1" />
+</vector>
diff --git a/res/drawable/ic_sms_light.xml b/res/drawable/ic_sms_light.xml
deleted file mode 100644
index 66058ae..0000000
--- a/res/drawable/ic_sms_light.xml
+++ /dev/null
@@ -1,15 +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="24dp"
- android:height="24dp"
- android:viewportWidth="24"
- android:viewportHeight="24">
- <path
- android:pathData="M11.9999,21.9998C6.4771,21.9998 1.9999,17.5226 1.9999,11.9998C1.9999,10.3532 2.3979,8.7996 3.1029,7.4298L2.028,3.1302C1.8615,2.4644 2.4646,1.8613 3.1304,2.0277L7.4301,3.1026C8.7998,2.3977 10.3534,1.9998 11.9999,1.9998C17.5228,1.9998 21.9999,6.4769 21.9999,11.9998C21.9999,17.5226 17.5228,21.9998 11.9999,21.9998ZM11.9999,17.9998C15.3749,17.9998 17.9999,16.8135 17.9999,13.4998C17.9999,8.6861 15.3749,5.9998 11.9999,5.9998C8.6249,5.9998 5.9999,8.6861 5.9999,13.4998C5.9999,16.8135 8.6249,17.9998 11.9999,17.9998ZM11.9999,13.7498C13.5283,13.7498 15.0275,13.4705 15.9999,12.9998C15.5627,14.3011 14.6666,15.9998 11.9999,15.9998C9.3333,15.9998 8.4372,14.3011 7.9999,12.9998C8.9723,13.4705 10.4716,13.7498 11.9999,13.7498Z"
- android:fillColor="#000000"
- android:fillType="evenOdd"/>
-</vector>
diff --git a/res/mipmap-anydpi/ic_launcher.xml b/res/mipmap-anydpi/ic_launcher.xml
index b58c81f..4f64c37 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..b4a472c
--- /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..d956bf2
--- /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..e105313
--- /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..df4dc02
--- /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..169e91c
--- /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..b5a98c5
--- /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..68187be
--- /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..1a1ca17
--- /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..4479b32
--- /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..e896c28
--- /dev/null
+++ b/res/mipmap-xxxhdpi/ic_foreground.png
Binary files differ
