psmattas/android_packages_apps_Cherish
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup clock position[2/2]

Browse Source 
Revert "Cherish:fix-up: statusbar clock date customization (2/2)"

This reverts commit 0b61f74039.

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

Revert "Cherish: Add option to auto hide status-bar clock [2/2]"

This reverts commit 6bc14947d6.

Revert "Cherish:Status bar clock/date customizations [2/2]"

This reverts commit eb7d3bf5c1.

Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
This commit is contained in:
Hưng Phan
2022-03-18 17:18:37 +07:00
parent 7db326c976
commit ee4fb9ccbe
5 changed files with 1 additions and 562 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
res/values/cherish_arrays.xml
View File

@@ -73,87 +73,6 @@
<item>1</item>
<item>2</item>
</string-array>
<!-- Statusbar Clock -->
<string-array name="status_bar_clock_style_entries" translatable="false">
<item>@string/status_bar_clock_style_left</item>
<item>@string/status_bar_clock_style_center</item>
<item>@string/status_bar_clock_style_right</item>
</string-array>
<string-array name="status_bar_clock_style_values" translatable="false">
<item>0</item>
<item>1</item>
<item>2</item>
</string-array>
<string-array name="status_bar_am_pm_entries" translatable="false">
<item>@string/status_bar_am_pm_hidden</item>
<item>@string/status_bar_am_pm_small</item>
<item>@string/status_bar_am_pm_normal</item>
</string-array>
<string-array name="status_bar_am_pm_values" 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>
<item>@string/clock_date_format_custom</item>
</string-array>
<string-array name="clock_date_position_entries" translatable="false">
<item>@string/clock_date_left</item>
<item>@string/clock_date_right</item>
</string-array>
<string-array name="clock_date_position_values" translatable="false">
<item>0</item>
<item>1</item>
</string-array>
<!-- VoLTE Icon Type -->
<string-array name="volte_icon_type_entries" translatable="false">

36
res/values/cherish_strings.xml
View File

@@ -265,42 +265,6 @@
<string name="quick_pulldown_right">Pulldown statusbar from right side</string>
<string name="quick_pulldown_left">Pulldown statusbar from left side</string>
<!-- Status bar clock and date options -->
<string name="status_bar_clock_date_title">Clock and date</string>
<string name="status_bar_clock_date_summary">Customize the statusbar clock and date</string>
<string name="status_bar_clock_title">Clock settings</string>
<string name="status_bar_clock_show">Show clock and date</string>
<string name="status_bar_clock_style_title">Clock style</string>
<string name="status_bar_clock_style_right">Right</string>
<string name="status_bar_clock_style_center">Center</string>
<string name="status_bar_clock_style_left">Left</string>
<string name="status_bar_am_pm_title">AM/PM style</string>
<string name="status_bar_am_pm_info">24-hour clock is enabled</string>
<string name="status_bar_am_pm_normal">Normal</string>
<string name="status_bar_am_pm_small">Small</string>
<string name="status_bar_am_pm_hidden">Hidden (default)</string>
<string name="clock_seconds_display">Show seconds</string>
<string name="status_bar_date_title">Date settings</string>
<string name="clock_date_display">Date</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">Date style</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>
<string name="clock_date_format_custom">Custom java format</string>
<string name="clock_date_format">Date format</string>
<string name="clock_date_string_edittext_title">Must be in DateFormat eg. MM/dd/yy</string>
<string name="clock_date_string_edittext_summary">Enter string</string>
<string name="clock_date_position">Date position</string>
<string name="clock_date_right">Right of time</string>
<string name="clock_date_left">Left of time</string>
<string name="status_bar_clock_auto_hide_title">Auto-hide clock</string>
<string name="status_bar_clock_auto_hide_summary">Hide and show clock at regular intervals of time</string>
<string name="status_bar_clock_auto_hide_hdur_title">Hide duration</string>
<string name="status_bar_clock_auto_hide_sdur_title">Show duration</string>
<!-- Incall vibrate options -->
<string name="incall_vibration_category">In-call vibration options</string>
<string name="incall_vibrate_connect_title">Vibrate on connect</string>

7
res/xml/cherish_settings_statusbar.xml
View File

@@ -30,11 +30,6 @@
android:key="statusbar_icons"
android:title="@string/sb_icons">
<Preference
android:title="@string/status_bar_clock_date_title"
android:summary="@string/status_bar_clock_date_summary"
android:fragment="com.cherish.settings.fragments.ClockDateSettings" />
<Preference
android:key="traffic"
android:fragment="com.cherish.settings.fragments.Traffic"
@@ -46,7 +41,7 @@
android:title="@string/data_disabled_icon_title"
android:summary="@string/data_disabled_icon_summary"
android:defaultValue="true"/>
<com.cherish.settings.preferences.SystemSettingSwitchPreference
android:key="show_fourg_icon"
android:title="@string/show_fourg_icon_title"

117
res/xml/clock_date_settings.xml
View File

@@ -1,117 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2018 AospExtended ROM 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"
xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
<PreferenceCategory
android:title="@string/status_bar_clock_title">
<com.cherish.settings.preferences.SystemSettingSwitchPreference
android:key="status_bar_clock"
android:title="@string/status_bar_clock_show"
android:defaultValue="true" />
<ListPreference
android:key="statusbar_clock_style"
android:title="@string/status_bar_clock_style_title"
android:dialogTitle="@string/status_bar_clock_style_title"
android:entries="@array/status_bar_clock_style_entries"
android:entryValues="@array/status_bar_clock_style_values"
android:summary="%s"
android:dependency="status_bar_clock" />
<ListPreference
android:key="statusbar_clock_am_pm_style"
android:title="@string/status_bar_am_pm_title"
android:dialogTitle="@string/status_bar_am_pm_title"
android:entries="@array/status_bar_am_pm_entries"
android:entryValues="@array/status_bar_am_pm_values"
android:summary="%s"
android:dependency="status_bar_clock" />
<com.cherish.settings.preferences.SystemSettingSwitchPreference
android:key="status_bar_clock_seconds"
android:title="@string/clock_seconds_display"
android:dependency="status_bar_clock"
android:defaultValue="false" />
<com.cherish.settings.preferences.SystemSettingSwitchPreference
android:key="status_bar_clock_auto_hide"
android:title="@string/status_bar_clock_auto_hide_title"
android:summary="@string/status_bar_clock_auto_hide_summary"
android:defaultValue="false" />
<com.cherish.settings.preferences.SystemSettingSeekBarPreference
android:key="status_bar_clock_auto_hide_hduration"
android:title="@string/status_bar_clock_auto_hide_hdur_title"
android:max="300"
settings:min="5"
settings:interval="5"
settings:units="sec"
android:dependency="status_bar_clock_auto_hide"
android:defaultValue="60" />
<com.cherish.settings.preferences.SystemSettingSeekBarPreference
android:key="status_bar_clock_auto_hide_sduration"
android:title="@string/status_bar_clock_auto_hide_sdur_title"
android:max="300"
settings:min="5"
settings:interval="5"
settings:units="sec"
android:dependency="status_bar_clock_auto_hide"
android:defaultValue="5" />
</PreferenceCategory>
<PreferenceCategory
android:title="@string/status_bar_date_title">
<ListPreference
android:key="statusbar_clock_date_display"
android:title="@string/clock_date_display"
android:summary="%s"
android:entries="@array/clock_date_display_entries"
android:entryValues="@array/clock_date_display_values"
android:dependency="status_bar_clock" />
<ListPreference
android:key="statusbar_clock_date_position"
android:title="@string/clock_date_position"
android:summary="%s"
android:entries="@array/clock_date_position_entries"
android:entryValues="@array/clock_date_position_values"
android:dependency="statusbar_clock_date_display" />
<ListPreference
android:key="statusbar_clock_date_style"
android:title="@string/clock_date_style"
android:summary="%s"
android:entries="@array/clock_date_style_entries"
android:entryValues="@array/clock_date_style_values"
android:dependency="statusbar_clock_date_display" />
<ListPreference
android:key="statusbar_clock_date_format"
android:title="@string/clock_date_format"
android:summary="%s"
android:entries="@array/clock_date_format_entries_values"
android:entryValues="@array/clock_date_format_entries_values"
android:dependency="statusbar_clock_date_display" />
</PreferenceCategory>
</PreferenceScreen>