Skip to content

Commit 50d1921

Browse files
C3C0C3C0
committed
QuietHours: reorganized settings
1 parent b366d9a commit 50d1921

File tree

4 files changed

+84
-54
lines changed

4 files changed

+84
-54
lines changed

‎res/values-cs/strings.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2044,4 +2044,10 @@
20442044
<string name="pref_lc_qh_range_days_title">Dny</string>
20452045
<string name="next_day">následující den</string>
20462046

2047+
<!-- QH: settings categorization -->
2048+
<string name="pref_lc_qh_cat_general_title">Obecné</string>
2049+
<string name="pref_lc_qh_cat_rules_title">Pravidla</string>
2050+
<string name="pref_lc_qh_manual_title">Manuální režim</string>
2051+
<string name="pref_lc_qh_manual_summary">Umožňuje nastavení pravidel pro manuální tiché hodiny</string>
2052+
20472053
</resources>

‎res/values-sk/strings.xml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2042,11 +2042,17 @@
20422042

20432043
<!-- QH: Time ranges -->
20442044
<string name="pref_lc_qh_ranges_title">Časové rozsahy</string>
2045-
<string name="pref_lc_qh_ranges_summary">Umožňuje nastaviť jeden alebo viac časových rozsahov pre automatické tiché hodiny</string>
2045+
<string name="pref_lc_qh_ranges_summary">Umožňuje nastaviť jeden alebo viac časových rozsahov a ich pravidiel pre automatické tiché hodiny</string>
20462046
<string name="lc_qh_ranges_list_label">Tiché hodiny - časové rozsahy</string>
20472047
<string name="lc_qh_ranges_list_empty">V súčasnosti nie sú nastavené žiadne časové rozsahy</string>
20482048
<string name="lc_qh_ranges_detail_label">Tiché hodiny - časový rozsah</string>
20492049
<string name="pref_lc_qh_range_days_title">Dni</string>
20502050
<string name="next_day">nasledujúci deň</string>
20512051

2052+
<!-- QH: settings categorization -->
2053+
<string name="pref_lc_qh_cat_general_title">Všeobecné</string>
2054+
<string name="pref_lc_qh_cat_rules_title">Pravidlá</string>
2055+
<string name="pref_lc_qh_manual_title">Manuálny režim</string>
2056+
<string name="pref_lc_qh_manual_summary">Umožňuje nastavenie pravidiel pre manuálne tiché hodiny</string>
2057+
20522058
</resources>

‎res/values/strings.xml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2113,11 +2113,17 @@
21132113

21142114
<!-- QH: Time ranges -->
21152115
<string name="pref_lc_qh_ranges_title">Set time ranges</string>
2116-
<string name="pref_lc_qh_ranges_summary">Allows to set one or more time ranges for automatic quiet hours</string>
2116+
<string name="pref_lc_qh_ranges_summary">Allows to set one or more time ranges and their rules for automatic quiet hours</string>
21172117
<string name="lc_qh_ranges_list_label">Quiet hours - time ranges</string>
21182118
<string name="lc_qh_ranges_list_empty">There are currently no time ranges set</string>
21192119
<string name="lc_qh_ranges_detail_label">Quiet hours - time range</string>
21202120
<string name="pref_lc_qh_range_days_title">Days</string>
21212121
<string name="next_day">next day</string>
21222122

2123+
<!-- QH: settings categorization -->
2124+
<string name="pref_lc_qh_cat_general_title">General</string>
2125+
<string name="pref_lc_qh_cat_rules_title">Rules</string>
2126+
<string name="pref_lc_qh_manual_title">Manual mode</string>
2127+
<string name="pref_lc_qh_manual_summary">Allows to set rules for manual quiet hours</string>
2128+
21232129
</resources>

‎res/xml/led_control_quiet_hours_settings.xml‎

Lines changed: 64 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -15,65 +15,77 @@
1515
-->
1616
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
1717

18-
<SwitchPreference
19-
android:key="pref_lc_qh_enabled"
20-
android:title="@string/pref_lc_qh_enabled_title"
21-
android:summary="@string/pref_lc_qh_enabled_summary"
22-
android:defaultValue="false" />
18+
<PreferenceCategory
19+
android:title="@string/pref_lc_qh_cat_general_title">
2320

24-
<CheckBoxPreference
25-
android:key="pref_lc_qh_mute_led"
26-
android:title="@string/pref_lc_qh_mute_led_title"
27-
android:defaultValue="false"
28-
android:dependency="pref_lc_qh_enabled" />
21+
<SwitchPreference
22+
android:key="pref_lc_qh_enabled"
23+
android:title="@string/pref_lc_qh_enabled_title"
24+
android:summary="@string/pref_lc_qh_enabled_summary"
25+
android:defaultValue="false" />
26+
27+
<CheckBoxPreference
28+
android:key="pref_lc_qh_statusbar_icon"
29+
android:title="@string/pref_lc_qh_statusbar_icon_title"
30+
android:summary="@string/pref_lc_qh_statusbar_icon_summary"
31+
android:defaultValue="true"
32+
android:dependency="pref_lc_qh_enabled" />
33+
34+
<CheckBoxPreference
35+
android:key="pref_lc_qh_interactive"
36+
android:title="@string/pref_lc_qh_interactive_title"
37+
android:summary="@string/pref_lc_qh_interactive_summary"
38+
android:defaultValue="false"
39+
android:dependency="pref_lc_qh_enabled" />
2940

30-
<CheckBoxPreference
31-
android:key="pref_lc_qh_mute_vibe"
32-
android:title="@string/pref_lc_qh_mute_vibe_title"
33-
android:summary="@string/pref_lc_qh_mute_vibe_summary"
34-
android:defaultValue="true"
35-
android:dependency="pref_lc_qh_enabled" />
41+
</PreferenceCategory>
3642

37-
<CheckBoxPreference
38-
android:key="pref_lc_qh_mute_system_vibe"
39-
android:title="@string/pref_lc_qh_mute_system_vibe_title"
40-
android:summary="@string/pref_lc_qh_mute_system_vibe_summary"
41-
android:defaultValue="false"
42-
android:dependency="pref_lc_qh_enabled" />
43+
<PreferenceCategory
44+
android:title="@string/pref_lc_qh_cat_rules_title"
45+
android:dependency="pref_lc_qh_enabled">
4346

44-
<MultiSelectListPreference
45-
android:key="pref_lc_qh_mute_system_sounds"
46-
android:title="@string/pref_lc_qh_mute_system_sounds_title"
47-
android:entries="@array/system_sound_entries"
48-
android:entryValues="@array/system_sound_values"
49-
android:defaultValue="@array/empty_array"
50-
android:dependency="pref_lc_qh_enabled" />
47+
<PreferenceScreen
48+
android:title="@string/pref_lc_qh_manual_title"
49+
android:summary="@string/pref_lc_qh_manual_summary">
5150

52-
<Preference
53-
android:key="pref_lc_qh_ringer_whitelist"
54-
android:title="@string/pref_lc_qh_ringer_whitelist_title"
55-
android:summary="@string/pref_lc_qh_ringer_whitelist_summary"
56-
android:persistent="false"
57-
android:dependency="pref_lc_qh_enabled" />
51+
<CheckBoxPreference
52+
android:key="pref_lc_qh_mute_led"
53+
android:title="@string/pref_lc_qh_mute_led_title"
54+
android:defaultValue="false" />
55+
56+
<CheckBoxPreference
57+
android:key="pref_lc_qh_mute_vibe"
58+
android:title="@string/pref_lc_qh_mute_vibe_title"
59+
android:summary="@string/pref_lc_qh_mute_vibe_summary"
60+
android:defaultValue="true" />
61+
62+
<CheckBoxPreference
63+
android:key="pref_lc_qh_mute_system_vibe"
64+
android:title="@string/pref_lc_qh_mute_system_vibe_title"
65+
android:summary="@string/pref_lc_qh_mute_system_vibe_summary"
66+
android:defaultValue="false" />
67+
68+
<MultiSelectListPreference
69+
android:key="pref_lc_qh_mute_system_sounds"
70+
android:title="@string/pref_lc_qh_mute_system_sounds_title"
71+
android:entries="@array/system_sound_entries"
72+
android:entryValues="@array/system_sound_values"
73+
android:defaultValue="@array/empty_array" />
74+
75+
<Preference
76+
android:key="pref_lc_qh_ringer_whitelist"
77+
android:title="@string/pref_lc_qh_ringer_whitelist_title"
78+
android:summary="@string/pref_lc_qh_ringer_whitelist_summary"
79+
android:persistent="false" />
5880

59-
<CheckBoxPreference
60-
android:key="pref_lc_qh_statusbar_icon"
61-
android:title="@string/pref_lc_qh_statusbar_icon_title"
62-
android:summary="@string/pref_lc_qh_statusbar_icon_summary"
63-
android:defaultValue="true"
64-
android:dependency="pref_lc_qh_enabled" />
81+
</PreferenceScreen>
6582

66-
<CheckBoxPreference
67-
android:key="pref_lc_qh_interactive"
68-
android:title="@string/pref_lc_qh_interactive_title"
69-
android:summary="@string/pref_lc_qh_interactive_summary"
70-
android:defaultValue="false"
71-
android:dependency="pref_lc_qh_enabled" />
83+
<Preference
84+
android:key="pref_lc_qh_ranges"
85+
android:title="@string/pref_lc_qh_ranges_title"
86+
android:summary="@string/pref_lc_qh_ranges_summary"
87+
android:persistent="false" />
7288

73-
<Preference
74-
android:key="pref_lc_qh_ranges"
75-
android:title="@string/pref_lc_qh_ranges_title"
76-
android:summary="@string/pref_lc_qh_ranges_summary"
77-
android:persistent="false" />
89+
</PreferenceCategory>
7890

7991
</PreferenceScreen>

0 commit comments

Comments
 (0)