Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(204)

Side by Side Diff: webrtc/examples/androidapp/src/org/appspot/apprtc/SettingsActivity.java

Issue 2464243002: Add Datachannel support to Android AppRTCMobile (Closed)
Patch Set: modify authors Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright 2014 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2014 The WebRTC Project Authors. All rights reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 private String keyprefDisableBuiltInAEC; 45 private String keyprefDisableBuiltInAEC;
46 private String keyprefDisableBuiltInAGC; 46 private String keyprefDisableBuiltInAGC;
47 private String keyprefDisableBuiltInNS; 47 private String keyprefDisableBuiltInNS;
48 private String keyprefEnableLevelControl; 48 private String keyprefEnableLevelControl;
49 private String keyprefSpeakerphone; 49 private String keyprefSpeakerphone;
50 50
51 private String keyPrefRoomServerUrl; 51 private String keyPrefRoomServerUrl;
52 private String keyPrefDisplayHud; 52 private String keyPrefDisplayHud;
53 private String keyPrefTracing; 53 private String keyPrefTracing;
54 54
55 private String keyprefEnableDataChannel;
56 private String keyprefOrdered;
57 private String keyprefMaxRetransmitTimeMs;
58 private String keyprefMaxRetransmits;
59 private String keyprefDataProtocol;
60 private String keyprefNegotiated;
61 private String keyprefDataId;
62
55 @Override 63 @Override
56 protected void onCreate(Bundle savedInstanceState) { 64 protected void onCreate(Bundle savedInstanceState) {
57 super.onCreate(savedInstanceState); 65 super.onCreate(savedInstanceState);
58 keyprefVideoCall = getString(R.string.pref_videocall_key); 66 keyprefVideoCall = getString(R.string.pref_videocall_key);
59 keyprefCamera2 = getString(R.string.pref_camera2_key); 67 keyprefCamera2 = getString(R.string.pref_camera2_key);
60 keyprefResolution = getString(R.string.pref_resolution_key); 68 keyprefResolution = getString(R.string.pref_resolution_key);
61 keyprefFps = getString(R.string.pref_fps_key); 69 keyprefFps = getString(R.string.pref_fps_key);
62 keyprefCaptureQualitySlider = getString(R.string.pref_capturequalityslider_k ey); 70 keyprefCaptureQualitySlider = getString(R.string.pref_capturequalityslider_k ey);
63 keyprefMaxVideoBitrateType = getString(R.string.pref_maxvideobitrate_key); 71 keyprefMaxVideoBitrateType = getString(R.string.pref_maxvideobitrate_key);
64 keyprefMaxVideoBitrateValue = getString(R.string.pref_maxvideobitratevalue_k ey); 72 keyprefMaxVideoBitrateValue = getString(R.string.pref_maxvideobitratevalue_k ey);
(...skipping 10 matching lines...) Expand all
75 keyprefDisableBuiltInAEC = getString(R.string.pref_disable_built_in_aec_key) ; 83 keyprefDisableBuiltInAEC = getString(R.string.pref_disable_built_in_aec_key) ;
76 keyprefDisableBuiltInAGC = getString(R.string.pref_disable_built_in_agc_key) ; 84 keyprefDisableBuiltInAGC = getString(R.string.pref_disable_built_in_agc_key) ;
77 keyprefDisableBuiltInNS = getString(R.string.pref_disable_built_in_ns_key); 85 keyprefDisableBuiltInNS = getString(R.string.pref_disable_built_in_ns_key);
78 keyprefEnableLevelControl = getString(R.string.pref_enable_level_control_key ); 86 keyprefEnableLevelControl = getString(R.string.pref_enable_level_control_key );
79 keyprefSpeakerphone = getString(R.string.pref_speakerphone_key); 87 keyprefSpeakerphone = getString(R.string.pref_speakerphone_key);
80 88
81 keyPrefRoomServerUrl = getString(R.string.pref_room_server_url_key); 89 keyPrefRoomServerUrl = getString(R.string.pref_room_server_url_key);
82 keyPrefDisplayHud = getString(R.string.pref_displayhud_key); 90 keyPrefDisplayHud = getString(R.string.pref_displayhud_key);
83 keyPrefTracing = getString(R.string.pref_tracing_key); 91 keyPrefTracing = getString(R.string.pref_tracing_key);
84 92
93 keyprefEnableDataChannel = getString(R.string.pref_enable_datachannel_key);
94 keyprefOrdered = getString(R.string.pref_ordered_key);
95 keyprefMaxRetransmitTimeMs = getString(R.string.pref_max_retransmit_time_ms_ key);
96 keyprefMaxRetransmits = getString(R.string.pref_max_retransmits_key);
97 keyprefDataProtocol = getString(R.string.pref_data_protocol_key);
98 keyprefNegotiated = getString(R.string.pref_negotiated_key);
99 keyprefDataId = getString(R.string.pref_data_id_key);
100
85 // Display the fragment as the main content. 101 // Display the fragment as the main content.
86 settingsFragment = new SettingsFragment(); 102 settingsFragment = new SettingsFragment();
87 getFragmentManager() 103 getFragmentManager()
88 .beginTransaction() 104 .beginTransaction()
89 .replace(android.R.id.content, settingsFragment) 105 .replace(android.R.id.content, settingsFragment)
90 .commit(); 106 .commit();
91 } 107 }
92 108
93 @Override 109 @Override
94 protected void onResume() { 110 protected void onResume() {
(...skipping 23 matching lines...) Expand all
118 updateSummaryB(sharedPreferences, keyprefOpenSLES); 134 updateSummaryB(sharedPreferences, keyprefOpenSLES);
119 updateSummaryB(sharedPreferences, keyprefDisableBuiltInAEC); 135 updateSummaryB(sharedPreferences, keyprefDisableBuiltInAEC);
120 updateSummaryB(sharedPreferences, keyprefDisableBuiltInAGC); 136 updateSummaryB(sharedPreferences, keyprefDisableBuiltInAGC);
121 updateSummaryB(sharedPreferences, keyprefDisableBuiltInNS); 137 updateSummaryB(sharedPreferences, keyprefDisableBuiltInNS);
122 updateSummaryB(sharedPreferences, keyprefEnableLevelControl); 138 updateSummaryB(sharedPreferences, keyprefEnableLevelControl);
123 updateSummaryList(sharedPreferences, keyprefSpeakerphone); 139 updateSummaryList(sharedPreferences, keyprefSpeakerphone);
124 140
125 updateSummary(sharedPreferences, keyPrefRoomServerUrl); 141 updateSummary(sharedPreferences, keyPrefRoomServerUrl);
126 updateSummaryB(sharedPreferences, keyPrefDisplayHud); 142 updateSummaryB(sharedPreferences, keyPrefDisplayHud);
127 updateSummaryB(sharedPreferences, keyPrefTracing); 143 updateSummaryB(sharedPreferences, keyPrefTracing);
144 updateSummaryB(sharedPreferences, keyprefEnableDataChannel);
145
146 updateSummary(sharedPreferences, keyprefMaxRetransmits);
147 updateSummary(sharedPreferences, keyprefMaxRetransmitTimeMs);
148 updateSummary(sharedPreferences, keyprefDataId);
149 updateSummary(sharedPreferences, keyprefDataProtocol);
128 150
129 if (!Camera2Enumerator.isSupported(this)) { 151 if (!Camera2Enumerator.isSupported(this)) {
130 Preference camera2Preference = settingsFragment.findPreference(keyprefCame ra2); 152 Preference camera2Preference = settingsFragment.findPreference(keyprefCame ra2);
131 153
132 camera2Preference.setSummary(getString(R.string.pref_camera2_not_supported )); 154 camera2Preference.setSummary(getString(R.string.pref_camera2_not_supported ));
133 camera2Preference.setEnabled(false); 155 camera2Preference.setEnabled(false);
134 } 156 }
135 157
136 // Disable forcing WebRTC based AEC so it won't affect our value. 158 // Disable forcing WebRTC based AEC so it won't affect our value.
137 // Otherwise, if it was enabled, isAcousticEchoCancelerSupported would alway s return false. 159 // Otherwise, if it was enabled, isAcousticEchoCancelerSupported would alway s return false.
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 } else if (key.equals(keyprefSpeakerphone)) { 225 } else if (key.equals(keyprefSpeakerphone)) {
204 updateSummaryList(sharedPreferences, key); 226 updateSummaryList(sharedPreferences, key);
205 } 227 }
206 // clang-format on 228 // clang-format on
207 if (key.equals(keyprefMaxVideoBitrateType)) { 229 if (key.equals(keyprefMaxVideoBitrateType)) {
208 setVideoBitrateEnable(sharedPreferences); 230 setVideoBitrateEnable(sharedPreferences);
209 } 231 }
210 if (key.equals(keyprefStartAudioBitrateType)) { 232 if (key.equals(keyprefStartAudioBitrateType)) {
211 setAudioBitrateEnable(sharedPreferences); 233 setAudioBitrateEnable(sharedPreferences);
212 } 234 }
235 if (key.equals(keyprefEnableDataChannel)) {
236 setDataChannelEnable(sharedPreferences);
237 }
213 } 238 }
214 239
215 private void updateSummary(SharedPreferences sharedPreferences, String key) { 240 private void updateSummary(SharedPreferences sharedPreferences, String key) {
216 Preference updatedPref = settingsFragment.findPreference(key); 241 Preference updatedPref = settingsFragment.findPreference(key);
217 // Set summary to be the user-description for the selected value 242 // Set summary to be the user-description for the selected value
218 updatedPref.setSummary(sharedPreferences.getString(key, "")); 243 updatedPref.setSummary(sharedPreferences.getString(key, ""));
219 } 244 }
220 245
221 private void updateSummaryBitrate(SharedPreferences sharedPreferences, String key) { 246 private void updateSummaryBitrate(SharedPreferences sharedPreferences, String key) {
222 Preference updatedPref = settingsFragment.findPreference(key); 247 Preference updatedPref = settingsFragment.findPreference(key);
(...skipping 30 matching lines...) Expand all
253 settingsFragment.findPreference(keyprefStartAudioBitrateValue); 278 settingsFragment.findPreference(keyprefStartAudioBitrateValue);
254 String bitrateTypeDefault = getString(R.string.pref_startaudiobitrate_defaul t); 279 String bitrateTypeDefault = getString(R.string.pref_startaudiobitrate_defaul t);
255 String bitrateType = 280 String bitrateType =
256 sharedPreferences.getString(keyprefStartAudioBitrateType, bitrateTypeDef ault); 281 sharedPreferences.getString(keyprefStartAudioBitrateType, bitrateTypeDef ault);
257 if (bitrateType.equals(bitrateTypeDefault)) { 282 if (bitrateType.equals(bitrateTypeDefault)) {
258 bitratePreferenceValue.setEnabled(false); 283 bitratePreferenceValue.setEnabled(false);
259 } else { 284 } else {
260 bitratePreferenceValue.setEnabled(true); 285 bitratePreferenceValue.setEnabled(true);
261 } 286 }
262 } 287 }
288
289 private void setDataChannelEnable(SharedPreferences sharedPreferences) {
290 boolean enabled = sharedPreferences.getBoolean(keyprefEnableDataChannel, tru e);
291 settingsFragment.findPreference(keyprefOrdered).setEnabled(enabled);
292 settingsFragment.findPreference(keyprefMaxRetransmitTimeMs).setEnabled(enabl ed);
293 settingsFragment.findPreference(keyprefMaxRetransmits).setEnabled(enabled);
294 settingsFragment.findPreference(keyprefDataProtocol).setEnabled(enabled);
295 settingsFragment.findPreference(keyprefNegotiated).setEnabled(enabled);
296 settingsFragment.findPreference(keyprefDataId).setEnabled(enabled);
297 }
263 } 298 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698