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

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

Issue 2194613003: Add an option to disable proximity sensor to AppRTC Demo Android. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@levelcontrol
Patch Set: Created 4 years, 4 months 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
« no previous file with comments | « webrtc/examples/androidapp/src/org/appspot/apprtc/AppRTCAudioManager.java ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 29 matching lines...) Expand all
40 private String keyprefStartAudioBitrateType; 40 private String keyprefStartAudioBitrateType;
41 private String keyprefStartAudioBitrateValue; 41 private String keyprefStartAudioBitrateValue;
42 private String keyPrefAudioCodec; 42 private String keyPrefAudioCodec;
43 private String keyprefNoAudioProcessing; 43 private String keyprefNoAudioProcessing;
44 private String keyprefAecDump; 44 private String keyprefAecDump;
45 private String keyprefOpenSLES; 45 private String keyprefOpenSLES;
46 private String keyprefDisableBuiltInAEC; 46 private String keyprefDisableBuiltInAEC;
47 private String keyprefDisableBuiltInAGC; 47 private String keyprefDisableBuiltInAGC;
48 private String keyprefDisableBuiltInNS; 48 private String keyprefDisableBuiltInNS;
49 private String keyprefEnableLevelControl; 49 private String keyprefEnableLevelControl;
50 private String keyprefSpeakerphone;
50 51
51 private String keyPrefRoomServerUrl; 52 private String keyPrefRoomServerUrl;
52 private String keyPrefDisplayHud; 53 private String keyPrefDisplayHud;
53 private String keyPrefTracing; 54 private String keyPrefTracing;
54 55
55 @Override 56 @Override
56 protected void onCreate(Bundle savedInstanceState) { 57 protected void onCreate(Bundle savedInstanceState) {
57 super.onCreate(savedInstanceState); 58 super.onCreate(savedInstanceState);
58 keyprefVideoCall = getString(R.string.pref_videocall_key); 59 keyprefVideoCall = getString(R.string.pref_videocall_key);
59 keyprefCamera2 = getString(R.string.pref_camera2_key); 60 keyprefCamera2 = getString(R.string.pref_camera2_key);
60 keyprefResolution = getString(R.string.pref_resolution_key); 61 keyprefResolution = getString(R.string.pref_resolution_key);
61 keyprefFps = getString(R.string.pref_fps_key); 62 keyprefFps = getString(R.string.pref_fps_key);
62 keyprefCaptureQualitySlider = getString(R.string.pref_capturequalityslider_k ey); 63 keyprefCaptureQualitySlider = getString(R.string.pref_capturequalityslider_k ey);
63 keyprefStartVideoBitrateType = getString(R.string.pref_startvideobitrate_key ); 64 keyprefStartVideoBitrateType = getString(R.string.pref_startvideobitrate_key );
64 keyprefStartVideoBitrateValue = getString(R.string.pref_startvideobitrateval ue_key); 65 keyprefStartVideoBitrateValue = getString(R.string.pref_startvideobitrateval ue_key);
65 keyPrefVideoCodec = getString(R.string.pref_videocodec_key); 66 keyPrefVideoCodec = getString(R.string.pref_videocodec_key);
66 keyprefHwCodec = getString(R.string.pref_hwcodec_key); 67 keyprefHwCodec = getString(R.string.pref_hwcodec_key);
67 keyprefCaptureToTexture = getString(R.string.pref_capturetotexture_key); 68 keyprefCaptureToTexture = getString(R.string.pref_capturetotexture_key);
68 69
69 keyprefStartAudioBitrateType = getString(R.string.pref_startaudiobitrate_key ); 70 keyprefStartAudioBitrateType = getString(R.string.pref_startaudiobitrate_key );
70 keyprefStartAudioBitrateValue = getString(R.string.pref_startaudiobitrateval ue_key); 71 keyprefStartAudioBitrateValue = getString(R.string.pref_startaudiobitrateval ue_key);
71 keyPrefAudioCodec = getString(R.string.pref_audiocodec_key); 72 keyPrefAudioCodec = getString(R.string.pref_audiocodec_key);
72 keyprefNoAudioProcessing = getString(R.string.pref_noaudioprocessing_key); 73 keyprefNoAudioProcessing = getString(R.string.pref_noaudioprocessing_key);
73 keyprefAecDump = getString(R.string.pref_aecdump_key); 74 keyprefAecDump = getString(R.string.pref_aecdump_key);
74 keyprefOpenSLES = getString(R.string.pref_opensles_key); 75 keyprefOpenSLES = getString(R.string.pref_opensles_key);
75 keyprefDisableBuiltInAEC = getString(R.string.pref_disable_built_in_aec_key) ; 76 keyprefDisableBuiltInAEC = getString(R.string.pref_disable_built_in_aec_key) ;
76 keyprefDisableBuiltInAGC = getString(R.string.pref_disable_built_in_agc_key) ; 77 keyprefDisableBuiltInAGC = getString(R.string.pref_disable_built_in_agc_key) ;
77 keyprefDisableBuiltInNS = getString(R.string.pref_disable_built_in_ns_key); 78 keyprefDisableBuiltInNS = getString(R.string.pref_disable_built_in_ns_key);
78 keyprefEnableLevelControl = getString(R.string.pref_enable_level_control_key ); 79 keyprefEnableLevelControl = getString(R.string.pref_enable_level_control_key );
80 keyprefSpeakerphone = getString(R.string.pref_speakerphone_key);
79 81
80 keyPrefRoomServerUrl = getString(R.string.pref_room_server_url_key); 82 keyPrefRoomServerUrl = getString(R.string.pref_room_server_url_key);
81 keyPrefDisplayHud = getString(R.string.pref_displayhud_key); 83 keyPrefDisplayHud = getString(R.string.pref_displayhud_key);
82 keyPrefTracing = getString(R.string.pref_tracing_key); 84 keyPrefTracing = getString(R.string.pref_tracing_key);
83 85
84 // Display the fragment as the main content. 86 // Display the fragment as the main content.
85 settingsFragment = new SettingsFragment(); 87 settingsFragment = new SettingsFragment();
86 getFragmentManager().beginTransaction() 88 getFragmentManager().beginTransaction()
87 .replace(android.R.id.content, settingsFragment) 89 .replace(android.R.id.content, settingsFragment)
88 .commit(); 90 .commit();
(...skipping 22 matching lines...) Expand all
111 updateSummaryBitrate(sharedPreferences, keyprefStartAudioBitrateValue); 113 updateSummaryBitrate(sharedPreferences, keyprefStartAudioBitrateValue);
112 setAudioBitrateEnable(sharedPreferences); 114 setAudioBitrateEnable(sharedPreferences);
113 updateSummary(sharedPreferences, keyPrefAudioCodec); 115 updateSummary(sharedPreferences, keyPrefAudioCodec);
114 updateSummaryB(sharedPreferences, keyprefNoAudioProcessing); 116 updateSummaryB(sharedPreferences, keyprefNoAudioProcessing);
115 updateSummaryB(sharedPreferences, keyprefAecDump); 117 updateSummaryB(sharedPreferences, keyprefAecDump);
116 updateSummaryB(sharedPreferences, keyprefOpenSLES); 118 updateSummaryB(sharedPreferences, keyprefOpenSLES);
117 updateSummaryB(sharedPreferences, keyprefDisableBuiltInAEC); 119 updateSummaryB(sharedPreferences, keyprefDisableBuiltInAEC);
118 updateSummaryB(sharedPreferences, keyprefDisableBuiltInAGC); 120 updateSummaryB(sharedPreferences, keyprefDisableBuiltInAGC);
119 updateSummaryB(sharedPreferences, keyprefDisableBuiltInNS); 121 updateSummaryB(sharedPreferences, keyprefDisableBuiltInNS);
120 updateSummaryB(sharedPreferences, keyprefEnableLevelControl); 122 updateSummaryB(sharedPreferences, keyprefEnableLevelControl);
123 updateSummaryList(sharedPreferences, keyprefSpeakerphone);
121 124
122 updateSummary(sharedPreferences, keyPrefRoomServerUrl); 125 updateSummary(sharedPreferences, keyPrefRoomServerUrl);
123 updateSummaryB(sharedPreferences, keyPrefDisplayHud); 126 updateSummaryB(sharedPreferences, keyPrefDisplayHud);
124 updateSummaryB(sharedPreferences, keyPrefTracing); 127 updateSummaryB(sharedPreferences, keyPrefTracing);
125 128
126 if (!Camera2Enumerator.isSupported()) { 129 if (!Camera2Enumerator.isSupported()) {
127 Preference camera2Preference = 130 Preference camera2Preference =
128 settingsFragment.findPreference(keyprefCamera2); 131 settingsFragment.findPreference(keyprefCamera2);
129 132
130 camera2Preference.setSummary(getString(R.string.pref_camera2_not_supported )); 133 camera2Preference.setSummary(getString(R.string.pref_camera2_not_supported ));
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 || key.equals(keyprefCaptureToTexture) 194 || key.equals(keyprefCaptureToTexture)
192 || key.equals(keyprefNoAudioProcessing) 195 || key.equals(keyprefNoAudioProcessing)
193 || key.equals(keyprefAecDump) 196 || key.equals(keyprefAecDump)
194 || key.equals(keyprefOpenSLES) 197 || key.equals(keyprefOpenSLES)
195 || key.equals(keyprefDisableBuiltInAEC) 198 || key.equals(keyprefDisableBuiltInAEC)
196 || key.equals(keyprefDisableBuiltInAGC) 199 || key.equals(keyprefDisableBuiltInAGC)
197 || key.equals(keyprefDisableBuiltInNS) 200 || key.equals(keyprefDisableBuiltInNS)
198 || key.equals(keyprefEnableLevelControl) 201 || key.equals(keyprefEnableLevelControl)
199 || key.equals(keyPrefDisplayHud)) { 202 || key.equals(keyPrefDisplayHud)) {
200 updateSummaryB(sharedPreferences, key); 203 updateSummaryB(sharedPreferences, key);
204 } else if (key.equals(keyprefSpeakerphone)) {
205 updateSummaryList(sharedPreferences, key);
201 } 206 }
202 if (key.equals(keyprefStartVideoBitrateType)) { 207 if (key.equals(keyprefStartVideoBitrateType)) {
203 setVideoBitrateEnable(sharedPreferences); 208 setVideoBitrateEnable(sharedPreferences);
204 } 209 }
205 if (key.equals(keyprefStartAudioBitrateType)) { 210 if (key.equals(keyprefStartAudioBitrateType)) {
206 setAudioBitrateEnable(sharedPreferences); 211 setAudioBitrateEnable(sharedPreferences);
207 } 212 }
208 } 213 }
209 214
210 private void updateSummary(SharedPreferences sharedPreferences, String key) { 215 private void updateSummary(SharedPreferences sharedPreferences, String key) {
211 Preference updatedPref = settingsFragment.findPreference(key); 216 Preference updatedPref = settingsFragment.findPreference(key);
212 // Set summary to be the user-description for the selected value 217 // Set summary to be the user-description for the selected value
213 updatedPref.setSummary(sharedPreferences.getString(key, "")); 218 updatedPref.setSummary(sharedPreferences.getString(key, ""));
214 } 219 }
215 220
216 private void updateSummaryBitrate( 221 private void updateSummaryBitrate(
217 SharedPreferences sharedPreferences, String key) { 222 SharedPreferences sharedPreferences, String key) {
218 Preference updatedPref = settingsFragment.findPreference(key); 223 Preference updatedPref = settingsFragment.findPreference(key);
219 updatedPref.setSummary(sharedPreferences.getString(key, "") + " kbps"); 224 updatedPref.setSummary(sharedPreferences.getString(key, "") + " kbps");
220 } 225 }
221 226
222 private void updateSummaryB(SharedPreferences sharedPreferences, String key) { 227 private void updateSummaryB(SharedPreferences sharedPreferences, String key) {
223 Preference updatedPref = settingsFragment.findPreference(key); 228 Preference updatedPref = settingsFragment.findPreference(key);
224 updatedPref.setSummary(sharedPreferences.getBoolean(key, true) 229 updatedPref.setSummary(sharedPreferences.getBoolean(key, true)
225 ? getString(R.string.pref_value_enabled) 230 ? getString(R.string.pref_value_enabled)
226 : getString(R.string.pref_value_disabled)); 231 : getString(R.string.pref_value_disabled));
227 } 232 }
228 233
234 private void updateSummaryList(SharedPreferences sharedPreferences, String key ) {
235 ListPreference updatedPref = (ListPreference) settingsFragment.findPreferenc e(key);
236 updatedPref.setSummary(updatedPref.getEntry());
237 }
238
229 private void setVideoBitrateEnable(SharedPreferences sharedPreferences) { 239 private void setVideoBitrateEnable(SharedPreferences sharedPreferences) {
230 Preference bitratePreferenceValue = 240 Preference bitratePreferenceValue =
231 settingsFragment.findPreference(keyprefStartVideoBitrateValue); 241 settingsFragment.findPreference(keyprefStartVideoBitrateValue);
232 String bitrateTypeDefault = getString(R.string.pref_startvideobitrate_defaul t); 242 String bitrateTypeDefault = getString(R.string.pref_startvideobitrate_defaul t);
233 String bitrateType = sharedPreferences.getString( 243 String bitrateType = sharedPreferences.getString(
234 keyprefStartVideoBitrateType, bitrateTypeDefault); 244 keyprefStartVideoBitrateType, bitrateTypeDefault);
235 if (bitrateType.equals(bitrateTypeDefault)) { 245 if (bitrateType.equals(bitrateTypeDefault)) {
236 bitratePreferenceValue.setEnabled(false); 246 bitratePreferenceValue.setEnabled(false);
237 } else { 247 } else {
238 bitratePreferenceValue.setEnabled(true); 248 bitratePreferenceValue.setEnabled(true);
239 } 249 }
240 } 250 }
241 251
242 private void setAudioBitrateEnable(SharedPreferences sharedPreferences) { 252 private void setAudioBitrateEnable(SharedPreferences sharedPreferences) {
243 Preference bitratePreferenceValue = 253 Preference bitratePreferenceValue =
244 settingsFragment.findPreference(keyprefStartAudioBitrateValue); 254 settingsFragment.findPreference(keyprefStartAudioBitrateValue);
245 String bitrateTypeDefault = getString(R.string.pref_startaudiobitrate_defaul t); 255 String bitrateTypeDefault = getString(R.string.pref_startaudiobitrate_defaul t);
246 String bitrateType = sharedPreferences.getString( 256 String bitrateType = sharedPreferences.getString(
247 keyprefStartAudioBitrateType, bitrateTypeDefault); 257 keyprefStartAudioBitrateType, bitrateTypeDefault);
248 if (bitrateType.equals(bitrateTypeDefault)) { 258 if (bitrateType.equals(bitrateTypeDefault)) {
249 bitratePreferenceValue.setEnabled(false); 259 bitratePreferenceValue.setEnabled(false);
250 } else { 260 } else {
251 bitratePreferenceValue.setEnabled(true); 261 bitratePreferenceValue.setEnabled(true);
252 } 262 }
253 } 263 }
254 } 264 }
OLDNEW
« no previous file with comments | « webrtc/examples/androidapp/src/org/appspot/apprtc/AppRTCAudioManager.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698