Skip to content

Commit 68ee1c8

Browse files
moxie0moxie0
committed
Make a general category, move notification settings back inline.
1 parent 14d88f6 commit 68ee1c8

2 files changed

Lines changed: 99 additions & 100 deletions

File tree

‎res/values/strings.xml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@
355355
<string name="AndroidManifest__verify_imported_identity">Verify Imported Identity</string>
356356

357357
<!-- preferences.xml -->
358-
358+
<string name="preferences__general">General</string>
359359
<string name="preferences__use_settings">Use Settings</string>
360360
<string name="preferences__pref_all_sms_title">Use for all SMS</string>
361361
<string name="preferences__pref_all_mms_title">Use for all MMS</string>
@@ -500,8 +500,6 @@
500500
<string name="verify_keys__menu_verified">Verified</string>
501501

502502
<!-- Misc. piggybacking -->
503-
<string name="PlayStoreListing">TextSecure is a security enhanced text messaging application that serves as a full replacement for the default text messaging application. Messages to other TextSecure users are encrypted over the air, and all text messages are stored in an encrypted database on the device. If your phone is lost or stolen, your messages will be safe, and communication with other TextSecure users can\'t be monitored over the air.</string>
504-
505503
<!-- EOF -->
506504

507505
</resources>

‎res/xml/preferences.xml‎

Lines changed: 98 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,66 @@
11
<?xml version="1.0" encoding="utf-8"?>
22

33
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
4-
<CheckBoxPreference android:defaultValue="true"
5-
android:key="pref_all_sms"
6-
android:summary="@string/preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages"
7-
android:title="@string/preferences__pref_all_sms_title" />
8-
9-
<CheckBoxPreference android:defaultValue="true"
10-
android:key="pref_all_mms"
11-
android:summary="@string/preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages"
12-
android:title="@string/preferences__pref_all_mms_title" />
13-
14-
<CheckBoxPreference android:defaultValue="false"
15-
android:key="pref_delivery_report_sms"
16-
android:summary="@string/preferences__request_a_delivery_report_for_each_sms_message_you_send"
17-
android:title="@string/preferences__sms_delivery_reports" />
18-
19-
<CheckBoxPreference android:defaultValue="false"
20-
android:key="pref_enter_sends"
21-
android:summary="@string/preferences__pressing_the_enter_key_will_send_text_messages"
22-
android:title="@string/preferences__pref_enter_sends_title" />
23-
24-
<PreferenceScreen android:title="@string/preferences__notifications">
25-
<CheckBoxPreference android:key="pref_key_enable_notifications"
26-
android:title="@string/preferences__notifications"
27-
android:summary="@string/preferences__display_message_notifications_in_status_bar"
28-
android:defaultValue="true" />
29-
<ListPreference
30-
android:key="pref_led_color"
31-
android:defaultValue="green"
32-
android:title="@string/preferences__led_color"
33-
android:dependency="pref_key_enable_notifications"
34-
android:summary="@string/preferences__change_notification_led_color"
35-
android:entries="@array/pref_led_color_entries"
36-
android:entryValues="@array/pref_led_color_values"
37-
android:dialogTitle="@string/preferences__select_led_color" />
38-
39-
<org.thoughtcrime.securesms.preferences.LedBlinkPatternListPreference
40-
android:key="pref_led_blink"
41-
android:defaultValue="500,2000"
42-
android:title="@string/preferences__pref_led_blink_title"
43-
android:dependency="pref_key_enable_notifications"
44-
android:summary="@string/preferences__change_notification_blink_pattern"
45-
android:entries="@array/pref_led_blink_pattern_entries"
46-
android:entryValues="@array/pref_led_blink_pattern_values"
47-
android:dialogTitle="@string/preferences__pref_led_blink_dialogtitle" />
48-
49-
50-
<RingtonePreference android:layout="?android:attr/preferenceLayoutChild"
51-
android:dependency="pref_key_enable_notifications"
52-
android:key="pref_key_ringtone"
53-
android:title="@string/preferences__select_ringtone"
54-
android:ringtoneType="notification"
55-
android:defaultValue="content://settings/system/notification_sound" />
56-
<CheckBoxPreference android:layout="?android:attr/preferenceLayoutChild"
57-
android:dependency="pref_key_enable_notifications"
58-
android:key="pref_key_vibrate"
59-
android:defaultValue="true"
60-
android:title="@string/preferences__vibrate"
61-
android:summary="@string/preferences__also_vibrate_when_notified" />
62-
</PreferenceScreen>
4+
<PreferenceCategory android:title="@string/preferences__general">
5+
<CheckBoxPreference android:defaultValue="true"
6+
android:key="pref_all_sms"
7+
android:summary="@string/preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages"
8+
android:title="@string/preferences__pref_all_sms_title" />
9+
10+
<CheckBoxPreference android:defaultValue="true"
11+
android:key="pref_all_mms"
12+
android:summary="@string/preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages"
13+
android:title="@string/preferences__pref_all_mms_title" />
14+
15+
<CheckBoxPreference android:defaultValue="false"
16+
android:key="pref_delivery_report_sms"
17+
android:summary="@string/preferences__request_a_delivery_report_for_each_sms_message_you_send"
18+
android:title="@string/preferences__sms_delivery_reports" />
19+
20+
<CheckBoxPreference android:defaultValue="false"
21+
android:key="pref_enter_sends"
22+
android:summary="@string/preferences__pressing_the_enter_key_will_send_text_messages"
23+
android:title="@string/preferences__pref_enter_sends_title" />
24+
</PreferenceCategory>
25+
<PreferenceCategory android:title="@string/preferences__notifications">
26+
<CheckBoxPreference android:key="pref_key_enable_notifications"
27+
android:title="@string/preferences__notifications"
28+
android:summary="@string/preferences__display_message_notifications_in_status_bar"
29+
android:defaultValue="true" />
30+
<ListPreference
31+
android:key="pref_led_color"
32+
android:defaultValue="green"
33+
android:title="@string/preferences__led_color"
34+
android:dependency="pref_key_enable_notifications"
35+
android:summary="@string/preferences__change_notification_led_color"
36+
android:entries="@array/pref_led_color_entries"
37+
android:entryValues="@array/pref_led_color_values"
38+
android:dialogTitle="@string/preferences__select_led_color" />
39+
40+
<org.thoughtcrime.securesms.preferences.LedBlinkPatternListPreference
41+
android:key="pref_led_blink"
42+
android:defaultValue="500,2000"
43+
android:title="@string/preferences__pref_led_blink_title"
44+
android:dependency="pref_key_enable_notifications"
45+
android:summary="@string/preferences__change_notification_blink_pattern"
46+
android:entries="@array/pref_led_blink_pattern_entries"
47+
android:entryValues="@array/pref_led_blink_pattern_values"
48+
android:dialogTitle="@string/preferences__pref_led_blink_dialogtitle" />
49+
50+
51+
<RingtonePreference android:layout="?android:attr/preferenceLayoutChild"
52+
android:dependency="pref_key_enable_notifications"
53+
android:key="pref_key_ringtone"
54+
android:title="@string/preferences__select_ringtone"
55+
android:ringtoneType="notification"
56+
android:defaultValue="content://settings/system/notification_sound" />
57+
<CheckBoxPreference android:layout="?android:attr/preferenceLayoutChild"
58+
android:dependency="pref_key_enable_notifications"
59+
android:key="pref_key_vibrate"
60+
android:defaultValue="true"
61+
android:title="@string/preferences__vibrate"
62+
android:summary="@string/preferences__also_vibrate_when_notified" />
63+
</PreferenceCategory>
6364

6465
<PreferenceCategory android:title="@string/preferences__storage">
6566
<CheckBoxPreference android:defaultValue="false"
@@ -117,42 +118,42 @@
117118
android:title="@string/preferences__complete_key_exchanges"
118119
android:summary="@string/preferences__automatically_complete_key_exchanges_for_new_sessions_or_for_existing_sessions_with_the_same_identity_key" />
119120

120-
<PreferenceScreen android:title="@string/preferences__identity_key_settings">
121-
<Preference android:key="pref_view_identity"
122-
android:title="@string/preferences__view_my_identity_key"
123-
android:summary="@string/preferences__view_my_identity_key"/>
124-
125-
<Preference android:key="pref_export_identity"
126-
android:title="@string/preferences__export_my_identity_key"
127-
android:summary="@string/preferences__export_my_identity_key"/>
128-
129-
<Preference android:key="pref_import_identity"
130-
android:title="@string/preferences__import_contacts_key"
131-
android:summary="@string/preferences__import_an_identity_key_from_a_contact"/>
132-
133-
<Preference android:key="pref_manage_identity"
134-
android:title="@string/preferences__manage_identity_keys"
135-
android:summary="@string/preferences__manage_configured_identity_keys"/>
136-
</PreferenceScreen>
137-
138-
<PreferenceScreen android:title="@string/preferences__advanced_mms_access_point_names">
139-
<CheckBoxPreference android:key="pref_use_local_apns"
140-
android:defaultValue="false"
141-
android:title="@string/preferences__enable_fallback_mmsc"
142-
android:summary="@string/preferences__use_mmsc_information_configured_here_when_system_apn_information_is_unavailable"/>
143-
144-
<EditTextPreference android:key="pref_apn_mmsc_host"
145-
android:title="@string/preferences__mmsc_url_required"
146-
android:dependency="pref_use_local_apns" />
147-
148-
<EditTextPreference android:key="pref_apn_mms_proxy"
149-
android:title="@string/preferences__mms_proxy_host_optional"
150-
android:dependency="pref_use_local_apns" />
151-
152-
<EditTextPreference android:key="pref_apn_mms_proxy_port"
153-
android:title="@string/preferences__mms_proxy_port_optional"
154-
android:dependency="pref_use_local_apns"
155-
android:inputType="number" />
156-
</PreferenceScreen>
157-
</PreferenceCategory>
121+
<PreferenceScreen android:title="@string/preferences__identity_key_settings">
122+
<Preference android:key="pref_view_identity"
123+
android:title="@string/preferences__view_my_identity_key"
124+
android:summary="@string/preferences__view_my_identity_key"/>
125+
126+
<Preference android:key="pref_export_identity"
127+
android:title="@string/preferences__export_my_identity_key"
128+
android:summary="@string/preferences__export_my_identity_key"/>
129+
130+
<Preference android:key="pref_import_identity"
131+
android:title="@string/preferences__import_contacts_key"
132+
android:summary="@string/preferences__import_an_identity_key_from_a_contact"/>
133+
134+
<Preference android:key="pref_manage_identity"
135+
android:title="@string/preferences__manage_identity_keys"
136+
android:summary="@string/preferences__manage_configured_identity_keys"/>
137+
</PreferenceScreen>
138+
139+
<PreferenceScreen android:title="@string/preferences__advanced_mms_access_point_names">
140+
<CheckBoxPreference android:key="pref_use_local_apns"
141+
android:defaultValue="false"
142+
android:title="@string/preferences__enable_fallback_mmsc"
143+
android:summary="@string/preferences__use_mmsc_information_configured_here_when_system_apn_information_is_unavailable"/>
144+
145+
<EditTextPreference android:key="pref_apn_mmsc_host"
146+
android:title="@string/preferences__mmsc_url_required"
147+
android:dependency="pref_use_local_apns" />
148+
149+
<EditTextPreference android:key="pref_apn_mms_proxy"
150+
android:title="@string/preferences__mms_proxy_host_optional"
151+
android:dependency="pref_use_local_apns" />
152+
153+
<EditTextPreference android:key="pref_apn_mms_proxy_port"
154+
android:title="@string/preferences__mms_proxy_port_optional"
155+
android:dependency="pref_use_local_apns"
156+
android:inputType="number" />
157+
</PreferenceScreen>
158+
</PreferenceCategory>
158159
</PreferenceScreen>

0 commit comments

Comments
 (0)