Merge branch 'lineage-21.0' of https://github.com/LineageOS/android_packages_apps_Gallery2 into leaf-3.1
Change-Id: I72e31ea65fd9e60ec6e02d76682d8bd769b2554c
diff --git a/res/drawable/ic_launcher_background.xml b/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index ea21fc0..0000000
--- a/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,27 +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">
- <group>
- <clip-path
- android:pathData="M0,0h108v108h-108z"/>
- <path
- android:pathData="M0,0h108v108h-108z"
- android:fillColor="#CBDEFB"/>
- <path
- android:pathData="M15,108L78,45L141,108H15Z"
- android:fillColor="#00354A"/>
- <path
- android:pathData="M-18,108L45,45L108,108H-18Z"
- android:fillColor="#0092E4"/>
- <path
- android:pathData="M61,13L45,29L61,45L77,29L61,13Z"
- android:fillColor="#F09F38"/>
- </group>
-</vector>
diff --git a/res/drawable/ic_launcher_camera_background.xml b/res/drawable/ic_launcher_camera_background.xml
deleted file mode 100644
index f99df4a..0000000
--- a/res/drawable/ic_launcher_camera_background.xml
+++ /dev/null
@@ -1,27 +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="#2A3232"/>
- <path
- android:pathData="M52.472,34C50.957,34 49.572,34.856 48.894,36.211L47,40L33.084,43.274C31.277,43.7 30,45.312 30,47.168V66C30,68.209 31.791,70 34,70H74C76.209,70 78,68.209 78,66V46.599C78,45.019 77.069,43.586 75.625,42.944L69,40L67.106,36.211C66.428,34.856 65.043,34 63.528,34H52.472Z"
- android:fillColor="#98A7A7"
- android:fillType="evenOdd"/>
- <path
- android:pathData="M30,47.171C30,45.314 31.278,43.701 33.086,43.277L38,42.124V70.001H34C31.791,70.001 30,68.21 30,66.001V47.171Z"
- android:fillColor="#D0D7D8"/>
- <path
- android:pathData="M34,47m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"
- android:fillColor="#0092E4"/>
- <path
- android:pathData="M58,54m-14,0a14,14 0,1 1,28 0a14,14 0,1 1,-28 0"
- android:fillColor="#2A3232"/>
-</vector>
diff --git a/res/drawable/ic_launcher_camera_foreground.xml b/res/drawable/ic_launcher_camera_foreground.xml
deleted file mode 100644
index ab24a75..0000000
--- a/res/drawable/ic_launcher_camera_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="M58,55m-17,0a17,17 0,1 1,34 0a17,17 0,1 1,-34 0"
- android:fillColor="#596666"/>
- <path
- android:pathData="M58,55m-15,0a15,15 0,1 1,30 0a15,15 0,1 1,-30 0"
- android:fillColor="#2A3232"/>
- <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_foreground.xml b/res/drawable/ic_launcher_foreground.xml
deleted file mode 100644
index 665ce95..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="M108,0H0V108H108V0ZM34,38C31.791,38 30,39.791 30,42V66C30,68.209 31.791,70 34,70H74C76.209,70 78,68.209 78,66V42C78,39.791 76.209,38 74,38H34Z"
- android:fillColor="#ffffff"
- 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 5992212..0000000
--- a/res/drawable/ic_launcher_monochrome.xml
+++ /dev/null
@@ -1,28 +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="M34,39.5L74,39.5A2.5,2.5 0,0 1,76.5 42L76.5,66A2.5,2.5 0,0 1,74 68.5L34,68.5A2.5,2.5 0,0 1,31.5 66L31.5,42A2.5,2.5 0,0 1,34 39.5z"
- android:strokeWidth="3"
- android:fillColor="#00000000"
- android:strokeColor="#ffffffff"/>
- <path
- android:pathData="M72.243,38L63.121,47.121L61,49.243L58.879,47.121L49.757,38H54L58.879,42.879L61,45L63.121,42.879L68,38H72.243Z"
- android:fillColor="#ffffffff"
- android:fillType="evenOdd"/>
- <path
- android:pathData="M78,45V66C78,68.13 76.335,69.871 74.236,69.993L63.621,59.379L78,45Z"
- android:fillColor="#ffffffff"
- android:fillType="evenOdd"/>
- <path
- android:pathData="M70,70H34C31.791,70 30,68.209 30,66V60L45,45L70,70Z"
- 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..25c3945
--- /dev/null
+++ b/res/drawable/ic_monochrome.xml
@@ -0,0 +1,20 @@
+<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="M152.5 136L279.5 136Q288.5 138.4 293 145.5L296 152.5L296 279.5Q293.5 288.5 286.5 293L279.5 296L152.5 296Q143.4 293.5 139 286.5L136 279.5L136 152.5Q138.4 143.4 145.5 139L152.5 136ZM153 146L151 147L146 153L147 245L175 222Q181 221 185 223L203 238L248 193L253 191Q259 190 262 193L283 220L286 222L286 153L285 151L280 146L153 146ZM253 201L216 238Q217 240 214 239L214 241L211 243Q212 245 209 244L209 246L205 249L201 249L180 231L178 231L173 235L146 259L146 280L147 282L153 286L244 286L249 287L275 287L282 285L285 282L287 275L287 251L287 245Q285 243 286 238L261 207L256 201L253 201Z"
+ android:fillColor="#070707"
+ android:fillAlpha="0.9568627"
+ android:strokeColor="#070707"
+ android:strokeAlpha="0.9568627"
+ android:strokeWidth="1" />
+ <path
+ android:pathData="M180.5 156L192.5 156L204 163.5L209 173.5L209 183.5Q206.3 193.3 198.5 198Q193 202.5 181.5 201Q173.8 198.8 169 193.5L164 184.5L164 172.5Q166.5 164.5 172.5 160L180.5 156ZM185 165L180 167L173 176Q172 182 175 186Q178 191 186 192L194 190L198 186L200 179L198 172Q195 165 185 165Z"
+ android:fillColor="#070707"
+ android:fillAlpha="0.9568627"
+ android:strokeColor="#070707"
+ android:strokeAlpha="0.9568627"
+ android:strokeWidth="1" />
+</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-anydpi/ic_launcher_camera.xml b/res/mipmap-anydpi/ic_launcher_camera.xml
deleted file mode 100644
index dc6bf3b..0000000
--- a/res/mipmap-anydpi/ic_launcher_camera.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- SPDX-FileCopyrightText: 2022 The LineageOS Project
- SPDX-License-Identifier: Apache-2.0
--->
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
- <background android:drawable="@drawable/ic_launcher_camera_background"/>
- <foreground android:drawable="@drawable/ic_launcher_camera_foreground"/>
-</adaptive-icon>
diff --git a/res/mipmap-hdpi/ic_background.png b/res/mipmap-hdpi/ic_background.png
new file mode 100644
index 0000000..16bcdc5
--- /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..9969295
--- /dev/null
+++ b/res/mipmap-hdpi/ic_foreground.png
Binary files differ
diff --git a/res/mipmap-hdpi/ic_launcher_camera.png b/res/mipmap-hdpi/ic_launcher_camera.png
new file mode 100644
index 0000000..c1ebe77
--- /dev/null
+++ b/res/mipmap-hdpi/ic_launcher_camera.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..bc97fa9
--- /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..a11ed30
--- /dev/null
+++ b/res/mipmap-mdpi/ic_foreground.png
Binary files differ
diff --git a/res/mipmap-mdpi/ic_launcher_camera.png b/res/mipmap-mdpi/ic_launcher_camera.png
new file mode 100644
index 0000000..20f1499
--- /dev/null
+++ b/res/mipmap-mdpi/ic_launcher_camera.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..f12d9c0
--- /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..a63937e
--- /dev/null
+++ b/res/mipmap-xhdpi/ic_foreground.png
Binary files differ
diff --git a/res/mipmap-xhdpi/ic_launcher_camera.png b/res/mipmap-xhdpi/ic_launcher_camera.png
new file mode 100644
index 0000000..972ee40
--- /dev/null
+++ b/res/mipmap-xhdpi/ic_launcher_camera.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..5affeba
--- /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..51c88b5
--- /dev/null
+++ b/res/mipmap-xxhdpi/ic_foreground.png
Binary files differ
diff --git a/res/mipmap-xxhdpi/ic_launcher_camera.png b/res/mipmap-xxhdpi/ic_launcher_camera.png
new file mode 100644
index 0000000..4cc58ee
--- /dev/null
+++ b/res/mipmap-xxhdpi/ic_launcher_camera.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..89d2ea5
--- /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..63a5fd2
--- /dev/null
+++ b/res/mipmap-xxxhdpi/ic_foreground.png
Binary files differ
diff --git a/res/mipmap-xxxhdpi/ic_launcher_camera.png b/res/mipmap-xxxhdpi/ic_launcher_camera.png
new file mode 100644
index 0000000..00de613
--- /dev/null
+++ b/res/mipmap-xxxhdpi/ic_launcher_camera.png
Binary files differ
