Cherish:Custom Text Clock Customizations [2/2]

Change-Id: I5d6dd4f45a259806e4a7ec004e8b459b7e1651bd
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>

res/values/cherish_arrays.xml

@@ -424,4 +424,17 @@
         <item>9</item>
         <item>10</item>
     </string-array>
+
+    <!-- Lockscreen Item Alignments -->
+    <string-array name="lockscreen_item_alignment_entries" translatable="false">
+        <item>@string/lock_item_left</item>
+        <item>@string/lock_item_center</item>
+        <item>@string/lock_item_right</item>
+    </string-array>
+
+    <string-array name="lockscreen_item_alignment_values" translatable="false">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+    </string-array>
 </resources>

res/values/cherish_strings.xml

@@ -483,6 +483,13 @@
     <string name="lockscreen_date_selection_str_border_gradient">Dark with gradient borders</string>
 
     <!-- Q To X Clock -->
-    <string name="center_text_clock_title">Center Text Clock</string>
+    <string name="center_text_clock_title">Lock Clock Alignment</string>
-    <string name="center_text_clock_summary">Tranform Q-Clock to X-Clock</string>
+
+    <!-- Lockscreen Item Alignments -->
+    <string name="lockscreen_date_alignment_title">LS Date Alignment</string>
+    <string name="lockscreen_ownerinfo_alignment_title">LS OwnerInfo Alignment</string>
+    <string name="lock_item_left">Left Aligned</string>
+    <string name="lock_item_center">Center Aligned</string>
+    <string name="lock_item_right">Right Aligned</string>
+    <string name="lockscreen_item_padding_title">Lockscreen Items Padding</string>
 </resources>

res/xml/cherish_settings_lockscreen.xml

@@ -50,6 +50,7 @@
         android:dialogTitle="@string/lockscreen_clock_dialog_title"
         android:entries="@array/lockscreen_clock_titles"
         android:entryValues="@array/lockscreen_clock_values"
+		 android:summary="%s"
         android:defaultValue="2" />
 
     <com.cherish.settings.preferences.SecureSettingListPreference
@@ -58,14 +59,9 @@
         android:dialogTitle="@string/lockscreen_date_dialog_title"
         android:entries="@array/lockscreen_date_selection_entries"
         android:entryValues="@array/lockscreen_date_selection_values"
+		 android:summary="%s"
         android:defaultValue="0" />
 
-    <com.cherish.settings.preferences.SecureSettingSwitchPreference
-        android:key="center_text_clock"
-        android:title="@string/center_text_clock_title"
-        android:summary="@string/center_text_clock_summary"
-        android:defaultValue="false" />
-
     <ListPreference
         android:key="lock_clock_fonts"
         android:title="@string/lock_clock_font_title"
@@ -96,6 +92,24 @@
         android:defaultValue="32"
         android:persistent="false" />
 		
+	<com.cherish.settings.preferences.SecureSettingListPreference
+        android:key="lock_ownerinfo_alignment"
+        android:title="@string/lockscreen_ownerinfo_alignment_title"
+        android:dialogTitle="@string/lockscreen_ownerinfo_alignment_title"
+        android:entries="@array/lockscreen_item_alignment_entries"
+        android:entryValues="@array/lockscreen_item_alignment_values"
+        android:summary="%s"
+        android:defaultValue="1" />
+
+    <com.cherish.settings.preferences.SecureSettingSeekBarPreference
+        android:key="lockscreen_item_padding"
+        android:title="@string/lockscreen_item_padding_title"
+        android:max="65"
+        settings:min="0"
+        settings:units="dp"
+        android:defaultValue="35" 
+		settings:interval="1"/>
+
    <PreferenceScreen
         android:key="lockscreen_colors"
         android:title="@string/lockscreen_colors"
@@ -150,6 +164,28 @@
         android:persistent="false" />
     </PreferenceCategory>
 	
+	<PreferenceCategory
+        android:title="Lockscreen Item Alignment Options"/>
+
+    <com.cherish.settings.preferences.SecureSettingListPreference
+        android:key="center_text_clock"
+        android:title="@string/center_text_clock_title"
+        android:dialogTitle="@string/center_text_clock_title"
+        android:entries="@array/lockscreen_item_alignment_entries"
+        android:entryValues="@array/lockscreen_item_alignment_values"
+        android:summary="%s"
+        android:defaultValue="1" />
+
+    <com.cherish.settings.preferences.SecureSettingListPreference
+        android:key="lock_date_alignment"
+        android:title="@string/lockscreen_date_alignment_title"
+        android:dialogTitle="@string/lockscreen_date_alignment_title"
+        android:entries="@array/lockscreen_item_alignment_entries"
+        android:entryValues="@array/lockscreen_item_alignment_values"
+        android:summary="%s"
+        android:defaultValue="1" />
+
+	</PreferenceCategory>
   <!-- Lockscreen Visualizer-->
     <PreferenceCategory
         android:key="visualizer"

src/com/cherish/settings/fragments/LockScreenSettings.java

@@ -40,6 +40,7 @@ import com.android.settings.SettingsPreferenceFragment;
 
 import com.cherish.settings.preferences.SystemSettingListPreference;
 import com.cherish.settings.preferences.CustomSeekBarPreference;
+import com.cherish.settings.preferences.SecureSettingListPreference;
 
 public class LockScreenSettings extends SettingsPreferenceFragment implements
         Preference.OnPreferenceChangeListener {