[2/2] OmniGears: Clock tweaks
PS5:
- added slims clock and date customizations for status bar
PS6:
- Remove color preference
- Refactored code
PS7/8:
- Fixed build
PS9:
- Fixed FC
PS10:
- Display date style & format if it is disabled
Base: https://gerrit.omnirom.org/#/c/4938/
Change-Id: I6d9a1db1717cbe08ed275c8cca21ec2ace7e96c4
diff --git a/res/values/custom_arrays.xml b/res/values/custom_arrays.xml
index dd68836..b0f28a2 100644
--- a/res/values/custom_arrays.xml
+++ b/res/values/custom_arrays.xml
@@ -315,4 +315,71 @@
<item>2</item>
</string-array>
+ <!--- Clock -->
+ <string-array name="clock_style_entries" translatable="false">
+ <item>@string/right_clock</item>
+ <item>@string/center_clock</item>
+ </string-array>
+
+ <string-array name="clock_style_values" translatable="false">
+ <item>0</item>
+ <item>1</item>
+ </string-array>
+
+ <string-array name="entries_status_bar_am_pm">
+ <item>@string/am_pm_clock_none</item>
+ <item>@string/am_pm_clock_small</item>
+ <item>@string/am_pm_clock_normal</item>
+ </string-array>
+
+ <string-array name="values_status_bar_am_pm" translatable="false">
+ <item>0</item>
+ <item>1</item>
+ <item>2</item>
+ </string-array>
+
+ <string-array name="clock_date_display_entries">
+ <item>@string/clock_date_display_none</item>
+ <item>@string/clock_date_display_small</item>
+ <item>@string/clock_date_display_normal</item>
+ </string-array>
+
+ <string-array name="clock_date_display_values" translatable="false">
+ <item>0</item>
+ <item>1</item>
+ <item>2</item>
+ </string-array>
+
+ <string-array name="clock_date_style_entries">
+ <item>@string/clock_date_style_normal</item>
+ <item>@string/clock_date_style_lowercase</item>
+ <item>@string/clock_date_style_uppercase</item>
+ </string-array>
+
+ <string-array name="clock_date_style_values" translatable="false">
+ <item>0</item>
+ <item>1</item>
+ <item>2</item>
+ </string-array>
+
+ <string-array name="clock_date_format_entries_values">
+ <item>dd/MM/yy</item>
+ <item>MM/dd/yy</item>
+ <item>yyyy-MM-dd</item>
+ <item>yyyy-dd-MM</item>
+ <item>dd-MM-yyyy</item>
+ <item>MM-dd-yyyy</item>
+ <item>MMM dd</item>
+ <item>MMM dd, yyyy</item>
+ <item>MMMM dd, yyyy</item>
+ <item>EEE</item>
+ <item>EEE dd</item>
+ <item>EEE dd/MM</item>
+ <item>EEE MM/dd</item>
+ <item>EEE dd MMM</item>
+ <item>EEE MMM dd</item>
+ <item>EEE MMMM dd</item>
+ <item>EEEE dd/MM</item>
+ <item>EEEE MM/dd</item>
+ </string-array>
</resources>
diff --git a/res/values/custom_strings.xml b/res/values/custom_strings.xml
index 26ba144..5273838 100644
--- a/res/values/custom_strings.xml
+++ b/res/values/custom_strings.xml
@@ -442,4 +442,34 @@
<string name="force_show_overflow_menu_title">Show overflow menu</string>
<string name="force_show_overflow_menu_summary">Force show the three-dot overflow menu in applications. Require restart of application</string>
+
+ <!-- Clock -->
+ <string name="status_bar_clock">Clock and date</string>
+ <string name="status_bar_clock_title">Clock and date style</string>
+ <string name="clock_title_enable">Alignment</string>
+ <string name="clock_enabled">Enabled</string>
+ <string name="clock_disabled">Disabled</string>
+ <string name="clock_color_title">Color</string>
+ <string name="status_bar_clock_style_reset">Reset color</string>
+ <string name="status_bar_show_clock_title">Show clock and date</string>
+ <string name="status_bar_am_pm_title">AM/PM</string>
+ <string name="status_bar_am_pm_info">24-hour clock is enabled</string>
+ <string name="enable_clock_weekday">Day of the week</string>
+ <string name="enable_clock_weekday_summary">Abbreviated day of the week before the time</string>
+ <string name="right_clock">Right clock</string>
+ <string name="center_clock">Center clock</string>
+ <string name="dont_show">Don\'t show</string>
+ <string name="clock_date_display">Date</string>
+ <string name="clock_date_display_summary">Display custom date before the clock</string>
+ <string name="clock_date_style">Date style</string>
+ <string name="clock_date_format">Date format</string>
+ <string name="am_pm_clock_normal">Normal font size</string>
+ <string name="am_pm_clock_small">Small font size</string>
+ <string name="am_pm_clock_none">Don\'t show</string>
+ <string name="clock_date_display_none">Don\'t show</string>
+ <string name="clock_date_display_small">Small font size</string>
+ <string name="clock_date_display_normal">Normal font size</string>
+ <string name="clock_date_style_normal">Normal</string>
+ <string name="clock_date_style_lowercase">Lowercase</string>
+ <string name="clock_date_style_uppercase">Uppercase</string>
</resources>
diff --git a/res/xml/bars_settings.xml b/res/xml/bars_settings.xml
index 60ae2a6..9b1d78c 100644
--- a/res/xml/bars_settings.xml
+++ b/res/xml/bars_settings.xml
@@ -71,6 +71,11 @@
android:summary="@string/qs_configurable_summary"
android:persistent="false"/>
+ <PreferenceScreen
+ android:fragment="org.omnirom.omnigears.slim.StatusBarClockStyle"
+ android:key="clock_style_pref"
+ android:title="@string/status_bar_clock" />
+
</PreferenceCategory>
<!-- Navigation bar -->
diff --git a/res/xml/status_bar_clock_style.xml b/res/xml/status_bar_clock_style.xml
new file mode 100644
index 0000000..28f9062
--- /dev/null
+++ b/res/xml/status_bar_clock_style.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2013 SlimRoms 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.
+-->
+
+<PreferenceScreen
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:title="@string/status_bar_clock_title">
+
+ <CheckBoxPreference
+ android:key="status_bar_show_clock"
+ android:title="@string/status_bar_show_clock_title"
+ android:defaultValue="true"
+ android:persistent="false"/>
+
+ <ListPreference
+ android:key="clock_style"
+ android:entries="@array/clock_style_entries"
+ android:entryValues="@array/clock_style_values"
+ android:title="@string/clock_title_enable"
+ android:dependency="status_bar_show_clock"
+ android:persistent="false"/>
+
+ <ListPreference
+ android:key="status_bar_am_pm"
+ android:dialogTitle="@string/status_bar_am_pm_title"
+ android:title="@string/status_bar_am_pm_title"
+ android:entries="@array/entries_status_bar_am_pm"
+ android:entryValues="@array/values_status_bar_am_pm"
+ android:dependency="status_bar_show_clock"
+ android:persistent="false"/>
+
+ <ListPreference
+ android:key="clock_date_display"
+ android:title="@string/clock_date_display"
+ android:summary="@string/clock_date_display_summary"
+ android:entries="@array/clock_date_display_entries"
+ android:entryValues="@array/clock_date_display_values"
+ android:dependency="status_bar_show_clock"
+ android:persistent="false"/>
+
+ <ListPreference
+ android:key="clock_date_style"
+ android:title="@string/clock_date_style"
+ android:entries="@array/clock_date_style_entries"
+ android:entryValues="@array/clock_date_style_values"
+ android:dependency="status_bar_show_clock"
+ android:persistent="false"/>
+
+ <ListPreference
+ android:key="clock_date_format"
+ android:title="@string/clock_date_format"
+ android:entries="@array/clock_date_format_entries_values"
+ android:entryValues="@array/clock_date_format_entries_values"
+ android:dependency="status_bar_show_clock"
+ android:persistent="false"/>
+
+</PreferenceScreen>