| 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 fd38f9039f63744f733e56cc6f81110025d8d3b9..6e23d978b92a92aaf7bda8210e4390f13a99386a 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);
|
| @@ -78,6 +86,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);
|
| @@ -122,6 +138,12 @@ public class SettingsActivity extends Activity implements OnSharedPreferenceChan
|
| updateSummaryB(sharedPreferences, keyprefEnableLevelControl);
|
| updateSummaryList(sharedPreferences, keyprefSpeakerphone);
|
|
|
| + updateSummaryB(sharedPreferences, keyprefEnableDataChannel);
|
| + updateSummary(sharedPreferences, keyprefMaxRetransmits);
|
| + updateSummary(sharedPreferences, keyprefMaxRetransmitTimeMs);
|
| + updateSummary(sharedPreferences, keyprefDataId);
|
| + updateSummary(sharedPreferences, keyprefDataProtocol);
|
| +
|
| updateSummary(sharedPreferences, keyPrefRoomServerUrl);
|
| updateSummaryB(sharedPreferences, keyPrefDisplayHud);
|
| updateSummaryB(sharedPreferences, keyPrefTracing);
|
| @@ -210,6 +232,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) {
|
| @@ -260,4 +285,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);
|
| + }
|
| }
|
|
|