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

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

Issue 2354883002: Add new Camera2Enumerator.isSupported with Context parameter. (Closed)
Patch Set: Cleanup. Created 4 years, 3 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
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 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 updateSummaryB(sharedPreferences, keyprefDisableBuiltInAEC); 119 updateSummaryB(sharedPreferences, keyprefDisableBuiltInAEC);
120 updateSummaryB(sharedPreferences, keyprefDisableBuiltInAGC); 120 updateSummaryB(sharedPreferences, keyprefDisableBuiltInAGC);
121 updateSummaryB(sharedPreferences, keyprefDisableBuiltInNS); 121 updateSummaryB(sharedPreferences, keyprefDisableBuiltInNS);
122 updateSummaryB(sharedPreferences, keyprefEnableLevelControl); 122 updateSummaryB(sharedPreferences, keyprefEnableLevelControl);
123 updateSummaryList(sharedPreferences, keyprefSpeakerphone); 123 updateSummaryList(sharedPreferences, keyprefSpeakerphone);
124 124
125 updateSummary(sharedPreferences, keyPrefRoomServerUrl); 125 updateSummary(sharedPreferences, keyPrefRoomServerUrl);
126 updateSummaryB(sharedPreferences, keyPrefDisplayHud); 126 updateSummaryB(sharedPreferences, keyPrefDisplayHud);
127 updateSummaryB(sharedPreferences, keyPrefTracing); 127 updateSummaryB(sharedPreferences, keyPrefTracing);
128 128
129 if (!Camera2Enumerator.isSupported()) { 129 if (!Camera2Enumerator.isSupported(this)) {
130 Preference camera2Preference = 130 Preference camera2Preference =
131 settingsFragment.findPreference(keyprefCamera2); 131 settingsFragment.findPreference(keyprefCamera2);
132 132
133 camera2Preference.setSummary(getString(R.string.pref_camera2_not_supported )); 133 camera2Preference.setSummary(getString(R.string.pref_camera2_not_supported ));
134 camera2Preference.setEnabled(false); 134 camera2Preference.setEnabled(false);
135 } 135 }
136 136
137 // Disable forcing WebRTC based AEC so it won't affect our value. 137 // Disable forcing WebRTC based AEC so it won't affect our value.
138 // Otherwise, if it was enabled, isAcousticEchoCancelerSupported would alway s return false. 138 // Otherwise, if it was enabled, isAcousticEchoCancelerSupported would alway s return false.
139 WebRtcAudioUtils.setWebRtcBasedAcousticEchoCanceler(false); 139 WebRtcAudioUtils.setWebRtcBasedAcousticEchoCanceler(false);
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 String bitrateTypeDefault = getString(R.string.pref_startaudiobitrate_defaul t); 255 String bitrateTypeDefault = getString(R.string.pref_startaudiobitrate_defaul t);
256 String bitrateType = sharedPreferences.getString( 256 String bitrateType = sharedPreferences.getString(
257 keyprefStartAudioBitrateType, bitrateTypeDefault); 257 keyprefStartAudioBitrateType, bitrateTypeDefault);
258 if (bitrateType.equals(bitrateTypeDefault)) { 258 if (bitrateType.equals(bitrateTypeDefault)) {
259 bitratePreferenceValue.setEnabled(false); 259 bitratePreferenceValue.setEnabled(false);
260 } else { 260 } else {
261 bitratePreferenceValue.setEnabled(true); 261 bitratePreferenceValue.setEnabled(true);
262 } 262 }
263 } 263 }
264 } 264 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698