Skip to content

Commit 9872f47

Browse files
atsakiridisatsakiridis
committed
Fixes #96: Remove webrtc related preferences from Messeger + SDK
1 parent 2b94037 commit 9872f47

File tree

3 files changed

+96
-91
lines changed

3 files changed

+96
-91
lines changed

‎Examples/restcomm-messenger/app/src/main/res/values/strings.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<string name="hello_world">Hello world!</string>
99

10-
10+
<!--
1111
<string name="settings_name" translatable="no">AppRTC Settings</string>
1212
<string name="disconnect_call">Disconnect Call</string>
1313
<string name="room_names">Room names:</string>
@@ -30,7 +30,7 @@
3030
<string name="connect_description">Connect to the room</string>
3131
<string name="connect_loopback_description">Loopback connection</string>
3232
33-
<!-- Settings strings. -->
33+
// TODO: Settings strings
3434
<string name="pref_room_key">room_preference</string>
3535
<string name="pref_room_list_key">room_list_preference</string>
3636
@@ -115,5 +115,6 @@
115115
<string name="pref_displayhud_title">Display call statistics.</string>
116116
<string name="pref_displayhud_dlg">Display call statistics.</string>
117117
<string name="pref_displayhud_default" translatable="false">false</string>
118+
-->
118119

119120
</resources>

‎Examples/restcomm-messenger/app/src/main/res/values/strings_activity_settings.xml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
<resources>
22
<string name="title_activity_settings">Settings</string>
33

4-
<!-- Strings related to Settings -->
4+
<!--
5+
// TODO: Strings related to Settings
56
6-
<!-- Example General settings -->
7+
// TODO: Example General settings
78
<string name="pref_header_general">General</string>
89
910
<string name="pref_title_social_recommendations">Enable social recommendations</string>
@@ -26,7 +27,7 @@
2627
<item>-1</item>
2728
</string-array>
2829
29-
<!-- Example settings for Data & Sync -->
30+
// TODO Example settings for Data & Sync
3031
<string name="pref_header_data_sync">Data &amp; sync</string>
3132
3233
<string name="pref_title_sync_frequency">Sync frequency</string>
@@ -49,7 +50,7 @@
4950
5051
<string name="pref_title_system_sync_settings">System sync settings</string>
5152
52-
<!-- Example settings for Notifications -->
53+
// TODO: Example settings for Notifications
5354
<string name="pref_header_notifications">Notifications</string>
5455
5556
<string name="pref_title_new_message_notifications">New message notifications</string>
@@ -58,4 +59,5 @@
5859
<string name="pref_ringtone_silent">Silent</string>
5960
6061
<string name="pref_title_vibrate">Vibrate</string>
62+
-->
6163
</resources>

‎Examples/restcomm-messenger/app/src/main/res/xml/preferences.xml‎

Lines changed: 87 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -22,95 +22,96 @@
2222
android:title="Proxy Port" />
2323
</PreferenceCategory>
2424

25-
<PreferenceCategory
26-
android:key="@string/pref_videosettings_key"
27-
android:title="@string/pref_videosettings_title">
28-
29-
<CheckBoxPreference
30-
android:key="@string/pref_videocall_key"
31-
android:title="@string/pref_videocall_title"
32-
android:dialogTitle="@string/pref_videocall_dlg"
33-
android:defaultValue="@string/pref_videocall_default" />
34-
35-
<ListPreference
36-
android:key="@string/pref_resolution_key"
37-
android:title="@string/pref_resolution_title"
38-
android:defaultValue="@string/pref_resolution_default"
39-
android:dialogTitle="@string/pref_resolution_dlg"
40-
android:entries="@array/videoResolutions"
41-
android:entryValues="@array/videoResolutionsValues" />
42-
43-
<ListPreference
44-
android:key="@string/pref_fps_key"
45-
android:title="@string/pref_fps_title"
46-
android:defaultValue="@string/pref_fps_default"
47-
android:dialogTitle="@string/pref_fps_dlg"
48-
android:entries="@array/cameraFps"
49-
android:entryValues="@array/cameraFps" />
50-
51-
<ListPreference
52-
android:key="@string/pref_startvideobitrate_key"
53-
android:title="@string/pref_startvideobitrate_title"
54-
android:defaultValue="@string/pref_startvideobitrate_default"
55-
android:dialogTitle="@string/pref_startvideobitrate_dlg"
56-
android:entries="@array/startBitrate"
57-
android:entryValues="@array/startBitrate" />
58-
59-
<EditTextPreference
60-
android:key="@string/pref_startvideobitratevalue_key"
61-
android:title="@string/pref_startvideobitratevalue_title"
62-
android:inputType="number"
63-
android:defaultValue="@string/pref_startvideobitratevalue_default"
64-
android:dialogTitle="@string/pref_startvideobitratevalue_dlg" />
65-
66-
<ListPreference
67-
android:key="@string/pref_videocodec_key"
68-
android:title="@string/pref_videocodec_title"
69-
android:defaultValue="@string/pref_videocodec_default"
70-
android:dialogTitle="@string/pref_videocodec_dlg"
71-
android:entries="@array/videoCodecs"
72-
android:entryValues="@array/videoCodecs" />
73-
74-
<CheckBoxPreference
75-
android:key="@string/pref_hwcodec_key"
76-
android:title="@string/pref_hwcodec_title"
77-
android:dialogTitle="@string/pref_hwcodec_dlg"
78-
android:defaultValue="@string/pref_hwcodec_default" />
79-
</PreferenceCategory>
25+
<!--
26+
<PreferenceCategory
27+
android:key="@string/pref_videosettings_key"
28+
android:title="@string/pref_videosettings_title">
29+
30+
<CheckBoxPreference
31+
android:key="@string/pref_videocall_key"
32+
android:title="@string/pref_videocall_title"
33+
android:dialogTitle="@string/pref_videocall_dlg"
34+
android:defaultValue="@string/pref_videocall_default" />
35+
36+
<ListPreference
37+
android:key="@string/pref_resolution_key"
38+
android:title="@string/pref_resolution_title"
39+
android:defaultValue="@string/pref_resolution_default"
40+
android:dialogTitle="@string/pref_resolution_dlg"
41+
android:entries="@array/videoResolutions"
42+
android:entryValues="@array/videoResolutionsValues" />
43+
44+
<ListPreference
45+
android:key="@string/pref_fps_key"
46+
android:title="@string/pref_fps_title"
47+
android:defaultValue="@string/pref_fps_default"
48+
android:dialogTitle="@string/pref_fps_dlg"
49+
android:entries="@array/cameraFps"
50+
android:entryValues="@array/cameraFps" />
51+
52+
<ListPreference
53+
android:key="@string/pref_startvideobitrate_key"
54+
android:title="@string/pref_startvideobitrate_title"
55+
android:defaultValue="@string/pref_startvideobitrate_default"
56+
android:dialogTitle="@string/pref_startvideobitrate_dlg"
57+
android:entries="@array/startBitrate"
58+
android:entryValues="@array/startBitrate" />
8059
81-
<PreferenceCategory
82-
android:key="@string/pref_audiosettings_key"
83-
android:title="@string/pref_audiosettings_title">
60+
<EditTextPreference
61+
android:key="@string/pref_startvideobitratevalue_key"
62+
android:title="@string/pref_startvideobitratevalue_title"
63+
android:inputType="number"
64+
android:defaultValue="@string/pref_startvideobitratevalue_default"
65+
android:dialogTitle="@string/pref_startvideobitratevalue_dlg" />
66+
67+
<ListPreference
68+
android:key="@string/pref_videocodec_key"
69+
android:title="@string/pref_videocodec_title"
70+
android:defaultValue="@string/pref_videocodec_default"
71+
android:dialogTitle="@string/pref_videocodec_dlg"
72+
android:entries="@array/videoCodecs"
73+
android:entryValues="@array/videoCodecs" />
74+
75+
<CheckBoxPreference
76+
android:key="@string/pref_hwcodec_key"
77+
android:title="@string/pref_hwcodec_title"
78+
android:dialogTitle="@string/pref_hwcodec_dlg"
79+
android:defaultValue="@string/pref_hwcodec_default" />
80+
</PreferenceCategory>
8481
85-
<ListPreference
86-
android:key="@string/pref_startaudiobitrate_key"
87-
android:title="@string/pref_startaudiobitrate_title"
88-
android:defaultValue="@string/pref_startaudiobitrate_default"
89-
android:dialogTitle="@string/pref_startaudiobitrate_dlg"
90-
android:entries="@array/startBitrate"
91-
android:entryValues="@array/startBitrate" />
82+
<PreferenceCategory
83+
android:key="@string/pref_audiosettings_key"
84+
android:title="@string/pref_audiosettings_title">
9285
93-
<EditTextPreference
94-
android:key="@string/pref_startaudiobitratevalue_key"
95-
android:title="@string/pref_startaudiobitratevalue_title"
96-
android:inputType="number"
97-
android:defaultValue="@string/pref_startaudiobitratevalue_default"
98-
android:dialogTitle="@string/pref_startaudiobitratevalue_dlg" />
99-
100-
<ListPreference
101-
android:key="@string/pref_audiocodec_key"
102-
android:title="@string/pref_audiocodec_title"
103-
android:defaultValue="@string/pref_audiocodec_default"
104-
android:dialogTitle="@string/pref_audiocodec_dlg"
105-
android:entries="@array/audioCodecs"
106-
android:entryValues="@array/audioCodecs" />
86+
<ListPreference
87+
android:key="@string/pref_startaudiobitrate_key"
88+
android:title="@string/pref_startaudiobitrate_title"
89+
android:defaultValue="@string/pref_startaudiobitrate_default"
90+
android:dialogTitle="@string/pref_startaudiobitrate_dlg"
91+
android:entries="@array/startBitrate"
92+
android:entryValues="@array/startBitrate" />
10793
108-
<CheckBoxPreference
109-
android:key="@string/pref_noaudioprocessing_key"
110-
android:title="@string/pref_noaudioprocessing_title"
111-
android:dialogTitle="@string/pref_noaudioprocessing_dlg"
112-
android:defaultValue="@string/pref_noaudioprocessing_default" />
113-
</PreferenceCategory>
94+
<EditTextPreference
95+
android:key="@string/pref_startaudiobitratevalue_key"
96+
android:title="@string/pref_startaudiobitratevalue_title"
97+
android:inputType="number"
98+
android:defaultValue="@string/pref_startaudiobitratevalue_default"
99+
android:dialogTitle="@string/pref_startaudiobitratevalue_dlg" />
100+
101+
<ListPreference
102+
android:key="@string/pref_audiocodec_key"
103+
android:title="@string/pref_audiocodec_title"
104+
android:defaultValue="@string/pref_audiocodec_default"
105+
android:dialogTitle="@string/pref_audiocodec_dlg"
106+
android:entries="@array/audioCodecs"
107+
android:entryValues="@array/audioCodecs" />
108+
109+
<CheckBoxPreference
110+
android:key="@string/pref_noaudioprocessing_key"
111+
android:title="@string/pref_noaudioprocessing_title"
112+
android:dialogTitle="@string/pref_noaudioprocessing_dlg"
113+
android:defaultValue="@string/pref_noaudioprocessing_default" />
114+
</PreferenceCategory>
114115
115116
<PreferenceCategory
116117
android:key="@string/pref_miscsettings_key"
@@ -135,5 +136,6 @@
135136
android:dialogTitle="@string/pref_displayhud_dlg"
136137
android:defaultValue="@string/pref_displayhud_default" />
137138
</PreferenceCategory>
139+
-->
138140

139141
</PreferenceScreen>

0 commit comments

Comments
 (0)