| Index: webrtc/examples/androidapp/src/org/appspot/apprtc/SettingsActivity.java
|
| diff --git a/webrtc/examples/androidapp/src/org/appspot/apprtc/SettingsActivity.java b/webrtc/examples/androidapp/src/org/appspot/apprtc/SettingsActivity.java
|
| index aee778bcfca56eb6dd0735b3ba3174e227da35fe..0448372fb43cc54c499db0ee744da69d9699a555 100644
|
| --- a/webrtc/examples/androidapp/src/org/appspot/apprtc/SettingsActivity.java
|
| +++ b/webrtc/examples/androidapp/src/org/appspot/apprtc/SettingsActivity.java
|
| @@ -52,6 +52,14 @@ public class SettingsActivity extends Activity implements OnSharedPreferenceChan
|
| private String keyPrefDisplayHud;
|
| private String keyPrefTracing;
|
|
|
| + private String keyprefEnableDataChannel;
|
| + private String keyprefOrdered;
|
| + private String keyprefMaxRetransmitTimeMs;
|
| + private String keyprefMaxRetransmits;
|
| + private String keyprefDataProtocol;
|
| + private String keyprefNegotiated;
|
| + private String keyprefDataId;
|
| +
|
| @Override
|
| protected void onCreate(Bundle savedInstanceState) {
|
| super.onCreate(savedInstanceState);
|
| @@ -79,6 +87,14 @@ public class SettingsActivity extends Activity implements OnSharedPreferenceChan
|
| keyprefEnableLevelControl = getString(R.string.pref_enable_level_control_key);
|
| keyprefSpeakerphone = getString(R.string.pref_speakerphone_key);
|
|
|
| + keyprefEnableDataChannel = getString(R.string.pref_enable_datachannel_key);
|
| + keyprefOrdered = getString(R.string.pref_ordered_key);
|
| + keyprefMaxRetransmitTimeMs = getString(R.string.pref_max_retransmit_time_ms_key);
|
| + keyprefMaxRetransmits = getString(R.string.pref_max_retransmits_key);
|
| + keyprefDataProtocol = getString(R.string.pref_data_protocol_key);
|
| + keyprefNegotiated = getString(R.string.pref_negotiated_key);
|
| + keyprefDataId = getString(R.string.pref_data_id_key);
|
| +
|
| keyPrefRoomServerUrl = getString(R.string.pref_room_server_url_key);
|
| keyPrefDisplayHud = getString(R.string.pref_displayhud_key);
|
| keyPrefTracing = getString(R.string.pref_tracing_key);
|
| @@ -124,6 +140,15 @@ public class SettingsActivity extends Activity implements OnSharedPreferenceChan
|
| updateSummaryB(sharedPreferences, keyprefEnableLevelControl);
|
| updateSummaryList(sharedPreferences, keyprefSpeakerphone);
|
|
|
| + updateSummaryB(sharedPreferences, keyprefEnableDataChannel);
|
| + updateSummaryB(sharedPreferences, keyprefOrdered);
|
| + updateSummary(sharedPreferences, keyprefMaxRetransmitTimeMs);
|
| + updateSummary(sharedPreferences, keyprefMaxRetransmits);
|
| + updateSummary(sharedPreferences, keyprefDataProtocol);
|
| + updateSummaryB(sharedPreferences, keyprefNegotiated);
|
| + updateSummary(sharedPreferences, keyprefDataId);
|
| + setDataChannelEnable(sharedPreferences);
|
| +
|
| updateSummary(sharedPreferences, keyPrefRoomServerUrl);
|
| updateSummaryB(sharedPreferences, keyPrefDisplayHud);
|
| updateSummaryB(sharedPreferences, keyPrefTracing);
|
| @@ -182,7 +207,11 @@ public class SettingsActivity extends Activity implements OnSharedPreferenceChan
|
| || key.equals(keyPrefVideoCodec)
|
| || key.equals(keyprefStartAudioBitrateType)
|
| || key.equals(keyPrefAudioCodec)
|
| - || key.equals(keyPrefRoomServerUrl)) {
|
| + || key.equals(keyPrefRoomServerUrl)
|
| + || key.equals(keyprefMaxRetransmitTimeMs)
|
| + || key.equals(keyprefMaxRetransmits)
|
| + || key.equals(keyprefDataProtocol)
|
| + || key.equals(keyprefDataId)) {
|
| updateSummary(sharedPreferences, key);
|
| } else if (key.equals(keyprefMaxVideoBitrateValue)
|
| || key.equals(keyprefStartAudioBitrateValue)) {
|
| @@ -201,7 +230,10 @@ public class SettingsActivity extends Activity implements OnSharedPreferenceChan
|
| || key.equals(keyprefDisableBuiltInAGC)
|
| || key.equals(keyprefDisableBuiltInNS)
|
| || key.equals(keyprefEnableLevelControl)
|
| - || key.equals(keyPrefDisplayHud)) {
|
| + || key.equals(keyPrefDisplayHud)
|
| + || key.equals(keyprefEnableDataChannel)
|
| + || key.equals(keyprefOrdered)
|
| + || key.equals(keyprefNegotiated)) {
|
| updateSummaryB(sharedPreferences, key);
|
| } else if (key.equals(keyprefSpeakerphone)) {
|
| updateSummaryList(sharedPreferences, key);
|
| @@ -213,6 +245,9 @@ public class SettingsActivity extends Activity implements OnSharedPreferenceChan
|
| if (key.equals(keyprefStartAudioBitrateType)) {
|
| setAudioBitrateEnable(sharedPreferences);
|
| }
|
| + if (key.equals(keyprefEnableDataChannel)) {
|
| + setDataChannelEnable(sharedPreferences);
|
| + }
|
| }
|
|
|
| private void updateSummary(SharedPreferences sharedPreferences, String key) {
|
| @@ -263,4 +298,14 @@ public class SettingsActivity extends Activity implements OnSharedPreferenceChan
|
| bitratePreferenceValue.setEnabled(true);
|
| }
|
| }
|
| +
|
| + private void setDataChannelEnable(SharedPreferences sharedPreferences) {
|
| + boolean enabled = sharedPreferences.getBoolean(keyprefEnableDataChannel, true);
|
| + settingsFragment.findPreference(keyprefOrdered).setEnabled(enabled);
|
| + settingsFragment.findPreference(keyprefMaxRetransmitTimeMs).setEnabled(enabled);
|
| + settingsFragment.findPreference(keyprefMaxRetransmits).setEnabled(enabled);
|
| + settingsFragment.findPreference(keyprefDataProtocol).setEnabled(enabled);
|
| + settingsFragment.findPreference(keyprefNegotiated).setEnabled(enabled);
|
| + settingsFragment.findPreference(keyprefDataId).setEnabled(enabled);
|
| + }
|
| }
|
|
|