From 53cc02ec278d0ef2994be7dfdfb2c92ab0770772 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C6=B0ng=20Phan?= <phandinhhungvp2001@gmail.com>
Date: Tue, 28 Apr 2020 21:27:54 +0700
Subject: [PATCH] Revert "Cherish: Recognizing fingerprint animation [2/2]"

This reverts commit d8168a3afb44104c97c279c052da93c79c2753ff.
---
 res/drawable/ic_fp.xml                               | 10 ----------
 res/values-vi/cherish_strings.xml                    |  4 ----
 res/values/cherish_strings.xml                       |  6 ------
 res/xml/cherish_settings_lockscreen.xml              | 12 ------------
 .../settings/fragments/LockScreenSettings.java       |  4 ----
 5 files changed, 36 deletions(-)
 delete mode 100644 res/drawable/ic_fp.xml

diff --git a/res/drawable/ic_fp.xml b/res/drawable/ic_fp.xml
deleted file mode 100644
index 70eb5b5..0000000
--- a/res/drawable/ic_fp.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24.0dp"
-        android:height="24.0dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="?android:attr/colorControlNormal">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M11.83,1.73C8.43,1.79 6.23,3.32 6.23,3.32C5.95,3.5 5.88,3.91 6.07,4.19C6.27,4.5 6.66,4.55 6.96,4.34C6.96,4.34 11.27,1.15 17.46,4.38C17.75,4.55 18.14,4.45 18.31,4.15C18.5,3.85 18.37,3.47 18.03,3.28C16.36,2.4 14.78,1.96 13.36,1.8C12.83,1.74 12.32,1.72 11.83,1.73M12.22,4.34C6.26,4.26 3.41,9.05 3.41,9.05C3.22,9.34 3.3,9.72 3.58,9.91C3.87,10.1 4.26,10 4.5,9.68C4.5,9.68 6.92,5.5 12.2,5.59C17.5,5.66 19.82,9.65 19.82,9.65C20,9.94 20.38,10.04 20.68,9.87C21,9.69 21.07,9.31 20.9,9C20.9,9 18.15,4.42 12.22,4.34M11.5,6.82C9.82,6.94 8.21,7.55 7,8.56C4.62,10.53 3.1,14.14 4.77,19C4.88,19.33 5.24,19.5 5.57,19.39C5.89,19.28 6.07,18.92 5.95,18.6V18.6C4.41,14.13 5.78,11.2 7.8,9.5C9.77,7.89 13.25,7.5 15.84,9.1C17.11,9.9 18.1,11.28 18.6,12.64C19.11,14 19.08,15.32 18.67,15.94C18.25,16.59 17.4,16.83 16.65,16.64C15.9,16.45 15.29,15.91 15.26,14.77C15.23,13.06 13.89,12 12.5,11.84C11.16,11.68 9.61,12.4 9.21,14C8.45,16.92 10.36,21.07 14.78,22.45C15.11,22.55 15.46,22.37 15.57,22.04C15.67,21.71 15.5,21.35 15.15,21.25C11.32,20.06 9.87,16.43 10.42,14.29C10.66,13.33 11.5,13 12.38,13.08C13.25,13.18 14,13.7 14,14.79C14.05,16.43 15.12,17.54 16.34,17.85C17.56,18.16 18.97,17.77 19.72,16.62C20.5,15.45 20.37,13.8 19.78,12.21C19.18,10.61 18.07,9.03 16.5,8.04C14.96,7.08 13.19,6.7 11.5,6.82M11.86,9.25V9.26C10.08,9.32 8.3,10.24 7.28,12.18C5.96,14.67 6.56,17.21 7.44,19.04C8.33,20.88 9.54,22.1 9.54,22.1C9.78,22.35 10.17,22.35 10.42,22.11C10.67,21.87 10.67,21.5 10.43,21.23C10.43,21.23 9.36,20.13 8.57,18.5C7.78,16.87 7.3,14.81 8.38,12.77C9.5,10.67 11.5,10.16 13.26,10.67C15.04,11.19 16.53,12.74 16.5,15.03C16.46,15.38 16.71,15.68 17.06,15.7C17.4,15.73 17.7,15.47 17.73,15.06C17.79,12.2 15.87,10.13 13.61,9.47C13.04,9.31 12.45,9.23 11.86,9.25M12.08,14.25C11.73,14.26 11.46,14.55 11.47,14.89C11.47,14.89 11.5,16.37 12.31,17.8C13.15,19.23 14.93,20.59 18.03,20.3C18.37,20.28 18.64,20 18.62,19.64C18.6,19.29 18.3,19.03 17.91,19.06C15.19,19.31 14.04,18.28 13.39,17.17C12.74,16.07 12.72,14.88 12.72,14.88C12.72,14.53 12.44,14.25 12.08,14.25Z" />
-</vector>
\ No newline at end of file
diff --git a/res/values-vi/cherish_strings.xml b/res/values-vi/cherish_strings.xml
index af30348..608c31d 100644
--- a/res/values-vi/cherish_strings.xml
+++ b/res/values-vi/cherish_strings.xml
@@ -284,10 +284,6 @@
     <!-- Power menu on secure lockscreen -->
     <string name="lockscreen_enable_power_menu_title">Menu nguồn</string>
     <string name="lockscreen_enable_power_menu_summary">Cho phép truy cập menu nguồn trên màn hình khóa an toàn</string>
-    <!-- FOD animation -->
-    <string name="fod_icon_picker_category_title">Tùy chọn FOD tùy chỉnh</string>
-    <string name="fod_recognizing_animation_title">Nhận dạng hình ảnh động</string>
-    <string name="fod_recognizing_animation_summary">Hiển thị hình ảnh động trong khi đọc dấu vân tay của bạn</string>
     <!-- R Notification headers -->
     <string name="notification_headers_title">Hiển thị tiêu đề thông báo</string>
     <string name="notification_headers_summary">Có hiển thị tiêu đề thông báo kiểu R hay không (Yêu cầu khởi động lại giao diện người dùng hệ thống)</string>
diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml
index f8121b9..2d1e19a 100644
--- a/res/values/cherish_strings.xml
+++ b/res/values/cherish_strings.xml
@@ -327,11 +327,6 @@
     <string name="lockscreen_enable_power_menu_title">Power menu</string>
     <string name="lockscreen_enable_power_menu_summary">Allow accessing power menu on secure lock screen</string>
 
-    <!-- FOD animation -->
-    <string name="fod_icon_picker_category_title">FOD customization options</string>
-    <string name="fod_recognizing_animation_title">Recognizing animation</string>
-    <string name="fod_recognizing_animation_summary">Show an animation while reading your fingerprint</string>
-
     <!-- Slim recents -->
     <string name="alternative_recents_category">Alternative recents</string>
     <string name="alternative_recents_swipe_up_enabled_warning_summary">When using swipe up home navigation to open recents, only stock recents are supported</string>
@@ -417,5 +412,4 @@
     <string name="title_animation_no_override">Prevent app overrides</string>
     <string name="summary_animation_no_override">Prevent apps from overriding transitions</string>
     <string name="animation_duration_default">Default</string>
-
 </resources>
diff --git a/res/xml/cherish_settings_lockscreen.xml b/res/xml/cherish_settings_lockscreen.xml
index bc64be9..d335e54 100644
--- a/res/xml/cherish_settings_lockscreen.xml
+++ b/res/xml/cherish_settings_lockscreen.xml
@@ -100,16 +100,4 @@
         android:summary="@string/fprint_sucess_vib_summary"
         android:persistent="false" />
 
-  <!-- FOD customization options -->
-    <PreferenceCategory
-            android:key="fod_icon_picker"
-            android:title="@string/fod_icon_picker_category_title" >
-
-  <com.cherish.settings.preferences.SystemSettingSwitchPreference
-            android:icon="@drawable/ic_fp"
-            android:key="fod_recognizing_animation"
-            android:title="@string/fod_recognizing_animation_title"
-            android:summary="@string/fod_recognizing_animation_summary"
-            android:defaultValue="true" />
-  </PreferenceCategory>
 </PreferenceScreen>
diff --git a/src/com/cherish/settings/fragments/LockScreenSettings.java b/src/com/cherish/settings/fragments/LockScreenSettings.java
index 24a395c..310caa1 100644
--- a/src/com/cherish/settings/fragments/LockScreenSettings.java
+++ b/src/com/cherish/settings/fragments/LockScreenSettings.java
@@ -24,7 +24,6 @@ import android.content.Context;
 import android.content.ContentResolver;
 import android.app.WallpaperManager;
 import android.content.Intent;
-import android.content.pm.PackageManager;
 import android.content.res.Resources;
 import android.hardware.fingerprint.FingerprintManager;
 import android.net.Uri;
@@ -40,7 +39,6 @@ import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 
 import com.cherish.settings.preferences.SystemSettingListPreference;
-import com.cherish.settings.preferences.SystemSettingSwitchPreference;
 
 public class LockScreenSettings extends SettingsPreferenceFragment implements
         Preference.OnPreferenceChangeListener {
@@ -58,8 +56,6 @@ public class LockScreenSettings extends SettingsPreferenceFragment implements
         ContentResolver resolver = getActivity().getContentResolver();
         final PreferenceScreen prefScreen = getPreferenceScreen();
         Resources resources = getResources();
-
-        PackageManager packageManager = getPackageManager();
         
         mFingerprintManager = (FingerprintManager) getActivity().getSystemService(Context.FINGERPRINT_SERVICE);
         mFingerprintVib = (SwitchPreference) findPreference(FINGERPRINT_VIB);