From 6b81ff6bd78414fd59455c4d2d50a7b348251588 Mon Sep 17 00:00:00 2001
From: AshutoshSundresh <ashutoshsundresh@gmail.com>
Date: Fri, 14 May 2021 18:29:37 +0530
Subject: [PATCH] Cherish: Implement FOD icon animation (2/2)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Joey Huab <joey@evolution-x.org>
Change-Id: Ie02aff09d2a7313cb18533bfb0eb2d35ec93e65f
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
---
 res/values/cherish_arrays.xml  | 13 +++++++++++++
 res/values/cherish_strings.xml |  7 +++++++
 res/xml/fod_settings.xml       | 20 ++++++++++++++++++--
 3 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/res/values/cherish_arrays.xml b/res/values/cherish_arrays.xml
index f1a99a7..eecf5a1 100644
--- a/res/values/cherish_arrays.xml
+++ b/res/values/cherish_arrays.xml
@@ -1269,4 +1269,17 @@
         <item>3</item>
         <item>4</item>
     </string-array>
+	
+	<!-- FOD icon animations -->
+    <string-array name="fod_icon_animation_entries" translatable="false">
+        <item>@string/fod_recog_animation_miui_normal</item>
+        <item>@string/fod_icon_animation_oneui1</item>
+        <item>@string/fod_icon_animation_oneui2</item>
+    </string-array>
+
+    <string-array name="fod_icon_animation_values" translatable="false">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+    </string-array>
 </resources>
diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml
index 5bd2286..381fd88 100644
--- a/res/values/cherish_strings.xml
+++ b/res/values/cherish_strings.xml
@@ -1180,6 +1180,13 @@
     <string name="fod_pressed_color_yellow">Yellow</string>
     <string name="fod_pressed_color_light_yellow">Light Yellow</string>
 	
+	<!-- FOD icon animation -->
+    <string name="fod_icon_animation">Animated FOD icon</string>
+    <string name="fod_icon_animation_effect_title">Select FOD icon animation effect</string>
+    <string name="fod_icon_animation_summary">Animate the FOD icon when turning on the screen</string>
+    <string name="fod_icon_animation_oneui1">OneUI 1</string>
+    <string name="fod_icon_animation_oneui2">OneUI 2</string>
+	
 	<!-- FOD icon picker -->
     <string name="fod_icon_picker_title">Fingerprint icon</string>
     <string name="fod_icon_picker_summary">Choose your favorite fingerprint icon</string>
diff --git a/res/xml/fod_settings.xml b/res/xml/fod_settings.xml
index 985778b..7b7b576 100644
--- a/res/xml/fod_settings.xml
+++ b/res/xml/fod_settings.xml
@@ -32,8 +32,8 @@
             android:title="@string/fod_recog_animation"
             android:summary="@string/fod_recog_animation_summary"
             android:defaultValue="false" />
-
-        <com.cherish.settings.preferences.SystemSettingListPreference
+			
+		<com.cherish.settings.preferences.SystemSettingListPreference
             android:key="fod_anim"
             android:title="@string/fod_recog_animation_effect_title"
             android:summary="%s"
@@ -41,6 +41,22 @@
             android:entryValues="@array/fod_recog_animation_values"
             android:defaultValue="0"
             android:dependency="fod_recognizing_animation" />
+			
+		<!-- Animated FOD icon -->
+        <com.cherish.settings.preferences.SystemSettingSwitchPreference
+            android:key="fod_icon_animation"
+            android:title="@string/fod_icon_animation"
+            android:summary="@string/fod_icon_animation_summary"
+            android:defaultValue="false" />
+
+        <com.cherish.settings.preferences.SystemSettingListPreference
+            android:key="fod_icon_anim_type"
+            android:title="@string/fod_icon_animation_effect_title"
+            android:summary="%s"
+            android:entries="@array/fod_icon_animation_entries"
+            android:entryValues="@array/fod_icon_animation_values"
+            android:defaultValue="0"
+            android:dependency="fod_icon_animation" />
 
         <com.cherish.settings.preferences.SystemSettingListPreference
             android:key="fod_color"