Merge branch 'lineage-21.0' of https://github.com/LineageOS/android_packages_apps_DeskClock into leaf-3.1
Change-Id: Ie1b7955579e5753aab54ab476e7d0d79c31afe9c
diff --git a/res/drawable/ic_launcher_background.xml b/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 8bb038e..0000000
--- a/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,23 +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="M37.147,39.859C36.783,40.292 36.81,40.932 37.209,41.334L49.958,54.17C49.973,54.186 49.989,54.201 50.006,54.217C50.002,54.145 50,54.073 50,54C50,51.953 51.537,50.266 53.52,50.028C53.502,50.015 53.484,50.002 53.465,49.989L38.611,39.663C38.146,39.34 37.511,39.425 37.147,39.859Z"
- android:fillColor="#ffffff"/>
- <path
- android:pathData="M75.449,36.002C75.087,35.57 74.453,35.492 73.997,35.822L54.501,49.942C54.466,49.967 54.432,49.993 54.399,50.02C56.421,50.22 58,51.925 58,54C58,54.1 57.996,54.2 57.989,54.298C58.021,54.27 58.052,54.241 58.083,54.211L75.374,37.464C75.779,37.071 75.812,36.433 75.449,36.002Z"
- android:fillColor="#ffffff"/>
- <path
- android:pathData="M54,54m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"
- android:fillColor="#98A7A7"/>
-</vector>
diff --git a/res/drawable/ic_launcher_foreground.xml b/res/drawable/ic_launcher_foreground.xml
deleted file mode 100644
index 5f494b6..0000000
--- a/res/drawable/ic_launcher_foreground.xml
+++ /dev/null
@@ -1,39 +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,79L54,54"
- android:strokeWidth="2"
- android:fillColor="#00000000"
- android:strokeColor="#FFD250"
- android:strokeLineCap="round"/>
- <path
- android:pathData="M54,54m-6,0a6,6 0,1 1,12 0a6,6 0,1 1,-12 0"
- android:fillColor="#F09F38"/>
- <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 3ac6a73..0000000
--- a/res/drawable/ic_launcher_monochrome.xml
+++ /dev/null
@@ -1,26 +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="M55,62.945C54.672,62.981 54.338,63 54,63C53.662,63 53.328,62.981 53,62.945V79C53,79.552 53.448,80 54,80C54.552,80 55,79.552 55,79V62.945Z"
- android:fillColor="#ffffffff"
- android:fillType="evenOdd"/>
- <path
- android:pathData="M75.449,36.002C75.087,35.57 74.453,35.492 73.997,35.822L59.12,46.597C60.439,47.512 61.503,48.77 62.18,50.242L75.374,37.464C75.779,37.071 75.811,36.433 75.449,36.002Z"
- android:fillColor="#ffffffff"
- android:fillType="evenOdd"/>
- <path
- android:pathData="M37.147,39.859C36.783,40.292 36.81,40.932 37.209,41.334L45.896,50.08C46.55,48.732 47.53,47.571 48.734,46.701L38.611,39.663C38.146,39.34 37.511,39.425 37.147,39.859Z"
- android:fillColor="#ffffffff"
- android:fillType="evenOdd"/>
- <path
- android:pathData="M54,54m-6,0a6,6 0,1 1,12 0a6,6 0,1 1,-12 0"
- android:fillColor="#ffffffff"/>
-</vector>
diff --git a/res/drawable/ic_monochrome.xml b/res/drawable/ic_monochrome.xml
new file mode 100644
index 0000000..8f6e35f
--- /dev/null
+++ b/res/drawable/ic_monochrome.xml
@@ -0,0 +1,34 @@
+<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="M171.5 134Q177 133 178 136.5Q179.3 142.8 175.5 144Q163 150 154.5 160L149.5 161Q145 160 146 153.5Q156.3 141.3 171.5 134Z"
+ android:fillColor="#070707"
+ android:fillAlpha="0.8823529"
+ android:strokeColor="#070707"
+ android:strokeAlpha="0.8823529"
+ android:strokeWidth="1" />
+ <path
+ android:pathData="M256.5 134L260.5 134L266.5 137Q277.7 143.8 286 153.5Q287 160 282.5 161L277.5 160L270.5 153L254 141.5Q252.8 135.3 256.5 134Z"
+ android:fillColor="#070707"
+ android:fillAlpha="0.8823529"
+ android:strokeColor="#070707"
+ android:strokeAlpha="0.8823529"
+ android:strokeWidth="1" />
+ <path
+ android:pathData="M206.5 144L225.5 144L241.5 148Q260.8 155.2 273 169.5Q283.9 181.6 289 199.5L291 209.5L291 228.5Q285.5 259.5 265.5 276L263 277.5L271 289.5L272 293.5L268.5 298Q262 299 261 294.5L254.5 284L239.5 291L231.5 293Q226.7 291.8 225.5 294L206.5 294L192.5 291L177 284L167.5 298Q161 299 160 294.5L161 289.5L169 277L167.5 277L158 267.5Q148 255.5 143 238.5L141 228.5L141 209.5Q146.5 178.5 166.5 162Q181.7 148.2 206.5 144ZM214 154L194 158Q182 162 174 170Q164 178 158 190L153 203L152 214L151 215L151 224L152 225L153 236Q157 250 166 261Q174 270 185 276L200 282L210 284L223 284L233 282Q247 278 257 270Q267 262 273 251L279 236L280 225L281 224Q281 208 277 197Q273 185 265 177Q255 164 239 158L228 155L214 154Z"
+ android:fillColor="#070707"
+ android:fillAlpha="0.8823529"
+ android:strokeColor="#070707"
+ android:strokeAlpha="0.8823529"
+ android:strokeWidth="1" />
+ <path
+ android:pathData="M213.5 170Q219.8 168.8 221 172.5L221 216.5L223.5 219L242 235.5Q242.6 240.6 239.5 242L232.5 241L211 221.5L211 172.5L213.5 170Z"
+ android:fillColor="#070707"
+ android:fillAlpha="0.8823529"
+ android:strokeColor="#070707"
+ android:strokeAlpha="0.8823529"
+ android:strokeWidth="1" />
+</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..31795f1
--- /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..6b71d53
--- /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..a1f55b4
--- /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..d876c64
--- /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..b8de8b2
--- /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..bfcfdaf
--- /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..9aa19b0
--- /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..c45d171
--- /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..d3126d9
--- /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..6d29f72
--- /dev/null
+++ b/res/mipmap-xxxhdpi/ic_foreground.png
Binary files differ
diff --git a/res/xml/screensaver_info.xml b/res/xml/screensaver_info.xml
index 57508f3..fc69f18 100644
--- a/res/xml/screensaver_info.xml
+++ b/res/xml/screensaver_info.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<dream xmlns:android="http://schemas.android.com/apk/res/android"
android:settingsActivity="com.android.deskclock.settings.ScreensaverSettingsActivity"
+ android:previewImage="@mipmap/launcher_clock"
/>
