From 25f6c89cad955632fb8efc87f0e836fec2ce891d Mon Sep 17 00:00:00 2001
From: Alex <du.alexcruz@gmail.com>
Date: Sat, 4 Jan 2020 01:48:37 -0500
Subject: [PATCH] Cherish:Introduce lockscreen clock/date styles [2/2]

Change-Id: I4f2693846bacc218c4c00c20b146841e79daa821
---
 res/drawable/ic_lockscreen_clock_selection.xml |  6 ++++++
 res/values/cherish_arrays.xml                  | 17 +++++++++++++++++
 res/values/cherish_strings.xml                 |  9 +++++++++
 res/xml/cherish_settings_lockscreen.xml        | 16 ++++++++++++++++
 4 files changed, 48 insertions(+)
 create mode 100644 res/drawable/ic_lockscreen_clock_selection.xml

diff --git a/res/drawable/ic_lockscreen_clock_selection.xml b/res/drawable/ic_lockscreen_clock_selection.xml
new file mode 100644
index 0000000..4aa4991
--- /dev/null
+++ b/res/drawable/ic_lockscreen_clock_selection.xml
@@ -0,0 +1,6 @@
+<vector android:height="24dp" android:viewportHeight="511.986"
+    android:viewportWidth="511.986" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="M473.299,216.264L268.057,5.152c-6.581,-6.735 -17.367,-6.886 -24.133,-0.338L38.766,204.11c-3.201,3.201 -5,7.542 -5,12.069c0,4.527 1.799,8.868 5,12.069l42.242,42.237c5.708,5.697 14.624,6.625 21.383,2.225v94.142c0.015,14.132 11.468,25.585 25.6,25.6h102.4v23.994c-20.069,11.587 -29.853,35.208 -23.855,57.592c5.998,22.384 26.282,37.948 49.455,37.948s43.458,-15.565 49.455,-37.948c5.998,-22.384 -3.787,-46.005 -23.855,-57.592v-23.994h102.4c14.132,-0.015 25.585,-11.468 25.6,-25.6v-93.617l3.283,3.283c6.668,6.656 17.466,6.656 24.133,0l36.208,-36.204C479.855,233.686 479.893,222.938 473.299,216.264zM290.124,460.718c-0.02,18.843 -15.29,34.113 -34.133,34.133c-18.851,0 -34.133,-15.282 -34.133,-34.133c0,-18.851 15.282,-34.133 34.133,-34.133S290.124,441.867 290.124,460.718zM247.458,410.289v-17.838h17.067v17.838C258.882,409.261 253.1,409.261 247.458,410.289zM392.524,366.852c-0.005,4.711 -3.822,8.529 -8.533,8.533h-256c-4.711,-0.005 -8.529,-3.822 -8.533,-8.533V256.168l136.533,-136.533l136.533,136.533V366.852zM424.941,264.452L268.057,107.568c-6.668,-6.656 -17.465,-6.656 -24.133,0l-150.85,150.85l-42.325,-42.15L255.816,17.056h0.008l205.325,211.192L424.941,264.452z"/>
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="M170.658,272.985c0,47.128 38.205,85.333 85.333,85.333c47.106,-0.054 85.279,-38.227 85.333,-85.333c0,-47.128 -38.205,-85.333 -85.333,-85.333S170.658,225.857 170.658,272.985zM264.524,213.252v-7.941c30.886,3.936 55.204,28.255 59.141,59.141h-7.941c-4.713,0 -8.533,3.821 -8.533,8.533c0,4.713 3.82,8.533 8.533,8.533h7.941c-3.936,30.886 -28.255,55.204 -59.141,59.141v-7.941c0,-4.713 -3.82,-8.533 -8.533,-8.533c-4.713,0 -8.533,3.821 -8.533,8.533v7.941c-30.886,-3.936 -55.204,-28.255 -59.141,-59.141h7.941c4.713,0 8.533,-3.821 8.533,-8.533c0,-4.713 -3.82,-8.533 -8.533,-8.533h-7.941c3.936,-30.886 28.255,-55.204 59.141,-59.141v7.941c0,4.713 3.82,8.533 8.533,8.533C260.704,221.785 264.524,217.964 264.524,213.252z"/>
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="M247.458,247.385v34.133c-0.001,2.263 0.898,4.434 2.499,6.035c1.6,1.6 3.771,2.499 6.035,2.499h17.067c4.713,0 8.533,-3.82 8.533,-8.533s-3.82,-8.533 -8.533,-8.533h-8.533v-25.6c0,-4.713 -3.82,-8.533 -8.533,-8.533C251.278,238.852 247.458,242.672 247.458,247.385z"/>
+</vector>
diff --git a/res/values/cherish_arrays.xml b/res/values/cherish_arrays.xml
index 6e65b16..7242c89 100644
--- a/res/values/cherish_arrays.xml
+++ b/res/values/cherish_arrays.xml
@@ -40,5 +40,22 @@
         <item>6</item>
         <item>7</item>
     </string-array>
+	
+	<!-- Lockscreen clock style -->
+    <string-array name="lockscreen_clock_titles">
+        <item>@string/lockscreen_clock_hide</item>
+        <item>@string/lockscreen_clock_default</item>
+        <item>@string/lockscreen_clock_default_bold</item>
+        <item>@string/lockscreen_clock_sammy</item>
+        <item>@string/lockscreen_clock_sammy_bold</item>
+    </string-array>
+
+    <string-array name="lockscreen_clock_values">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>5</item>
+    </string-array>
 
 </resources>
\ No newline at end of file
diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml
index 415b053..1366e96 100644
--- a/res/values/cherish_strings.xml
+++ b/res/values/cherish_strings.xml
@@ -79,5 +79,14 @@
     <string name="brightness_slider_qs_unexpanded_summary">Shows brightness slider below qs panel</string>
     <string name="qs_brightness_position_bottom_title">Brightness slider at bottom</string>
     <string name="qs_brightness_position_bottom_summary">Show a brightness slider on bottom quick settings</string>
+	
+     <!-- Lockscreen clock style -->
+    <string name="lockscreen_clock_title">Clock style</string>
+    <string name="lockscreen_clock_dialog_title">Select clock style</string>
+    <string name="lockscreen_clock_hide">Hide</string>
+    <string name="lockscreen_clock_default">Default</string>
+    <string name="lockscreen_clock_default_bold">Default (bold)</string>
+    <string name="lockscreen_clock_sammy">Sammy</string>
+    <string name="lockscreen_clock_sammy_bold">Sammy (bold)</string>
 
 </resources>
diff --git a/res/xml/cherish_settings_lockscreen.xml b/res/xml/cherish_settings_lockscreen.xml
index e5abff6..d81dacd 100644
--- a/res/xml/cherish_settings_lockscreen.xml
+++ b/res/xml/cherish_settings_lockscreen.xml
@@ -30,4 +30,20 @@
             android:title="@string/lockscreen_media_art_title"
             android:icon="@drawable/ic_media"
             android:defaultValue="true" />
+
+   <!-- Lockscreen Clock -->
+    <PreferenceCategory
+        android:key="lockscreen_clock"
+        android:title="@string/lockscreen_clock_title">
+   
+   <com.cherish.settings.preferences.SecureSettingListPreference
+        android:key="lockscreen_clock_selection"
+        android:icon="@drawable/ic_lockscreen_clock_selection"
+        android:title="@string/lockscreen_clock_title"
+        android:dialogTitle="@string/lockscreen_clock_dialog_title"
+        android:entries="@array/lockscreen_clock_titles"
+        android:entryValues="@array/lockscreen_clock_values"
+        android:defaultValue="2" />
+
+   </PreferenceCategory>
 </PreferenceScreen>