OLD | NEW |
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 21 matching lines...) Expand all Loading... |
32 private String keyprefHwCodec; | 32 private String keyprefHwCodec; |
33 | 33 |
34 private String keyprefStartAudioBitrateType; | 34 private String keyprefStartAudioBitrateType; |
35 private String keyprefStartAudioBitrateValue; | 35 private String keyprefStartAudioBitrateValue; |
36 private String keyPrefAudioCodec; | 36 private String keyPrefAudioCodec; |
37 private String keyprefNoAudioProcessing; | 37 private String keyprefNoAudioProcessing; |
38 private String keyprefOpenSLES; | 38 private String keyprefOpenSLES; |
39 | 39 |
40 private String keyPrefRoomServerUrl; | 40 private String keyPrefRoomServerUrl; |
41 private String keyPrefDisplayHud; | 41 private String keyPrefDisplayHud; |
| 42 private String keyPrefTracing; |
42 | 43 |
43 @Override | 44 @Override |
44 protected void onCreate(Bundle savedInstanceState) { | 45 protected void onCreate(Bundle savedInstanceState) { |
45 super.onCreate(savedInstanceState); | 46 super.onCreate(savedInstanceState); |
46 keyprefVideoCall = getString(R.string.pref_videocall_key); | 47 keyprefVideoCall = getString(R.string.pref_videocall_key); |
47 keyprefResolution = getString(R.string.pref_resolution_key); | 48 keyprefResolution = getString(R.string.pref_resolution_key); |
48 keyprefFps = getString(R.string.pref_fps_key); | 49 keyprefFps = getString(R.string.pref_fps_key); |
49 keyprefCaptureQualitySlider = getString(R.string.pref_capturequalityslider_k
ey); | 50 keyprefCaptureQualitySlider = getString(R.string.pref_capturequalityslider_k
ey); |
50 keyprefStartVideoBitrateType = getString(R.string.pref_startvideobitrate_key
); | 51 keyprefStartVideoBitrateType = getString(R.string.pref_startvideobitrate_key
); |
51 keyprefStartVideoBitrateValue = getString(R.string.pref_startvideobitrateval
ue_key); | 52 keyprefStartVideoBitrateValue = getString(R.string.pref_startvideobitrateval
ue_key); |
52 keyPrefVideoCodec = getString(R.string.pref_videocodec_key); | 53 keyPrefVideoCodec = getString(R.string.pref_videocodec_key); |
53 keyprefHwCodec = getString(R.string.pref_hwcodec_key); | 54 keyprefHwCodec = getString(R.string.pref_hwcodec_key); |
54 | 55 |
55 keyprefStartAudioBitrateType = getString(R.string.pref_startaudiobitrate_key
); | 56 keyprefStartAudioBitrateType = getString(R.string.pref_startaudiobitrate_key
); |
56 keyprefStartAudioBitrateValue = getString(R.string.pref_startaudiobitrateval
ue_key); | 57 keyprefStartAudioBitrateValue = getString(R.string.pref_startaudiobitrateval
ue_key); |
57 keyPrefAudioCodec = getString(R.string.pref_audiocodec_key); | 58 keyPrefAudioCodec = getString(R.string.pref_audiocodec_key); |
58 keyprefNoAudioProcessing = getString(R.string.pref_noaudioprocessing_key); | 59 keyprefNoAudioProcessing = getString(R.string.pref_noaudioprocessing_key); |
59 keyprefOpenSLES = getString(R.string.pref_opensles_key); | 60 keyprefOpenSLES = getString(R.string.pref_opensles_key); |
60 | 61 |
61 keyPrefRoomServerUrl = getString(R.string.pref_room_server_url_key); | 62 keyPrefRoomServerUrl = getString(R.string.pref_room_server_url_key); |
62 keyPrefDisplayHud = getString(R.string.pref_displayhud_key); | 63 keyPrefDisplayHud = getString(R.string.pref_displayhud_key); |
| 64 keyPrefTracing = getString(R.string.pref_tracing_key); |
63 | 65 |
64 // Display the fragment as the main content. | 66 // Display the fragment as the main content. |
65 settingsFragment = new SettingsFragment(); | 67 settingsFragment = new SettingsFragment(); |
66 getFragmentManager().beginTransaction() | 68 getFragmentManager().beginTransaction() |
67 .replace(android.R.id.content, settingsFragment) | 69 .replace(android.R.id.content, settingsFragment) |
68 .commit(); | 70 .commit(); |
69 } | 71 } |
70 | 72 |
71 @Override | 73 @Override |
72 protected void onResume() { | 74 protected void onResume() { |
(...skipping 14 matching lines...) Expand all Loading... |
87 | 89 |
88 updateSummary(sharedPreferences, keyprefStartAudioBitrateType); | 90 updateSummary(sharedPreferences, keyprefStartAudioBitrateType); |
89 updateSummaryBitrate(sharedPreferences, keyprefStartAudioBitrateValue); | 91 updateSummaryBitrate(sharedPreferences, keyprefStartAudioBitrateValue); |
90 setAudioBitrateEnable(sharedPreferences); | 92 setAudioBitrateEnable(sharedPreferences); |
91 updateSummary(sharedPreferences, keyPrefAudioCodec); | 93 updateSummary(sharedPreferences, keyPrefAudioCodec); |
92 updateSummaryB(sharedPreferences, keyprefNoAudioProcessing); | 94 updateSummaryB(sharedPreferences, keyprefNoAudioProcessing); |
93 updateSummaryB(sharedPreferences, keyprefOpenSLES); | 95 updateSummaryB(sharedPreferences, keyprefOpenSLES); |
94 | 96 |
95 updateSummary(sharedPreferences, keyPrefRoomServerUrl); | 97 updateSummary(sharedPreferences, keyPrefRoomServerUrl); |
96 updateSummaryB(sharedPreferences, keyPrefDisplayHud); | 98 updateSummaryB(sharedPreferences, keyPrefDisplayHud); |
| 99 updateSummaryB(sharedPreferences, keyPrefTracing); |
97 } | 100 } |
98 | 101 |
99 @Override | 102 @Override |
100 protected void onPause() { | 103 protected void onPause() { |
101 super.onPause(); | 104 super.onPause(); |
102 SharedPreferences sharedPreferences = | 105 SharedPreferences sharedPreferences = |
103 settingsFragment.getPreferenceScreen().getSharedPreferences(); | 106 settingsFragment.getPreferenceScreen().getSharedPreferences(); |
104 sharedPreferences.unregisterOnSharedPreferenceChangeListener(this); | 107 sharedPreferences.unregisterOnSharedPreferenceChangeListener(this); |
105 } | 108 } |
106 | 109 |
107 @Override | 110 @Override |
108 public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, | 111 public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, |
109 String key) { | 112 String key) { |
110 if (key.equals(keyprefResolution) | 113 if (key.equals(keyprefResolution) |
111 || key.equals(keyprefFps) | 114 || key.equals(keyprefFps) |
112 || key.equals(keyprefStartVideoBitrateType) | 115 || key.equals(keyprefStartVideoBitrateType) |
113 || key.equals(keyPrefVideoCodec) | 116 || key.equals(keyPrefVideoCodec) |
114 || key.equals(keyprefStartAudioBitrateType) | 117 || key.equals(keyprefStartAudioBitrateType) |
115 || key.equals(keyPrefAudioCodec) | 118 || key.equals(keyPrefAudioCodec) |
116 || key.equals(keyPrefRoomServerUrl)) { | 119 || key.equals(keyPrefRoomServerUrl)) { |
117 updateSummary(sharedPreferences, key); | 120 updateSummary(sharedPreferences, key); |
118 } else if (key.equals(keyprefStartVideoBitrateValue) | 121 } else if (key.equals(keyprefStartVideoBitrateValue) |
119 || key.equals(keyprefStartAudioBitrateValue)) { | 122 || key.equals(keyprefStartAudioBitrateValue)) { |
120 updateSummaryBitrate(sharedPreferences, key); | 123 updateSummaryBitrate(sharedPreferences, key); |
121 } else if (key.equals(keyprefVideoCall) | 124 } else if (key.equals(keyprefVideoCall) |
122 || key.equals(keyprefCaptureQualitySlider) | 125 || key.equals(keyprefCaptureQualitySlider) |
123 || key.equals(keyprefHwCodec) | 126 || key.equals(keyprefHwCodec) |
124 || key.equals(keyprefNoAudioProcessing) | 127 || key.equals(keyprefNoAudioProcessing) |
125 || key.equals(keyprefOpenSLES) | 128 || key.equals(keyprefOpenSLES) |
126 || key.equals(keyPrefDisplayHud)) { | 129 || key.equals(keyPrefDisplayHud) |
| 130 || key.equals(keyPrefTracing)) { |
127 updateSummaryB(sharedPreferences, key); | 131 updateSummaryB(sharedPreferences, key); |
128 } | 132 } |
129 if (key.equals(keyprefStartVideoBitrateType)) { | 133 if (key.equals(keyprefStartVideoBitrateType)) { |
130 setVideoBitrateEnable(sharedPreferences); | 134 setVideoBitrateEnable(sharedPreferences); |
131 } | 135 } |
132 if (key.equals(keyprefStartAudioBitrateType)) { | 136 if (key.equals(keyprefStartAudioBitrateType)) { |
133 setAudioBitrateEnable(sharedPreferences); | 137 setAudioBitrateEnable(sharedPreferences); |
134 } | 138 } |
135 } | 139 } |
136 | 140 |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
172 String bitrateTypeDefault = getString(R.string.pref_startaudiobitrate_defaul
t); | 176 String bitrateTypeDefault = getString(R.string.pref_startaudiobitrate_defaul
t); |
173 String bitrateType = sharedPreferences.getString( | 177 String bitrateType = sharedPreferences.getString( |
174 keyprefStartAudioBitrateType, bitrateTypeDefault); | 178 keyprefStartAudioBitrateType, bitrateTypeDefault); |
175 if (bitrateType.equals(bitrateTypeDefault)) { | 179 if (bitrateType.equals(bitrateTypeDefault)) { |
176 bitratePreferenceValue.setEnabled(false); | 180 bitratePreferenceValue.setEnabled(false); |
177 } else { | 181 } else { |
178 bitratePreferenceValue.setEnabled(true); | 182 bitratePreferenceValue.setEnabled(true); |
179 } | 183 } |
180 } | 184 } |
181 } | 185 } |
OLD | NEW |