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

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

Issue 2358133003: Revert of Rename AppRTCDemo on Android and iOS to AppRTCMobile (Closed)
Patch Set: Created 4 years, 2 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 364 matching lines...) Expand 10 before | Expand all | Expand 10 after
375 audioStartBitrate = Integer.parseInt(bitrateValue); 375 audioStartBitrate = Integer.parseInt(bitrateValue);
376 } 376 }
377 377
378 // Check statistics display option. 378 // Check statistics display option.
379 boolean displayHud = sharedPref.getBoolean(keyprefDisplayHud, 379 boolean displayHud = sharedPref.getBoolean(keyprefDisplayHud,
380 Boolean.valueOf(getString(R.string.pref_displayhud_default))); 380 Boolean.valueOf(getString(R.string.pref_displayhud_default)));
381 381
382 boolean tracing = sharedPref.getBoolean( 382 boolean tracing = sharedPref.getBoolean(
383 keyprefTracing, Boolean.valueOf(getString(R.string.pref_tracing_defa ult))); 383 keyprefTracing, Boolean.valueOf(getString(R.string.pref_tracing_defa ult)));
384 384
385 // Start AppRTCMobile activity. 385 // Start AppRTCDemo activity.
386 Log.d(TAG, "Connecting to room " + roomId + " at URL " + roomUrl); 386 Log.d(TAG, "Connecting to room " + roomId + " at URL " + roomUrl);
387 if (validateUrl(roomUrl)) { 387 if (validateUrl(roomUrl)) {
388 Uri uri = Uri.parse(roomUrl); 388 Uri uri = Uri.parse(roomUrl);
389 Intent intent = new Intent(this, CallActivity.class); 389 Intent intent = new Intent(this, CallActivity.class);
390 intent.setData(uri); 390 intent.setData(uri);
391 intent.putExtra(CallActivity.EXTRA_ROOMID, roomId); 391 intent.putExtra(CallActivity.EXTRA_ROOMID, roomId);
392 intent.putExtra(CallActivity.EXTRA_LOOPBACK, loopback); 392 intent.putExtra(CallActivity.EXTRA_LOOPBACK, loopback);
393 intent.putExtra(CallActivity.EXTRA_VIDEO_CALL, videoCallEnabled); 393 intent.putExtra(CallActivity.EXTRA_VIDEO_CALL, videoCallEnabled);
394 intent.putExtra(CallActivity.EXTRA_CAMERA2, useCamera2); 394 intent.putExtra(CallActivity.EXTRA_CAMERA2, useCamera2);
395 intent.putExtra(CallActivity.EXTRA_VIDEO_WIDTH, videoWidth); 395 intent.putExtra(CallActivity.EXTRA_VIDEO_WIDTH, videoWidth);
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
457 } 457 }
458 }; 458 };
459 459
460 private final OnClickListener connectListener = new OnClickListener() { 460 private final OnClickListener connectListener = new OnClickListener() {
461 @Override 461 @Override
462 public void onClick(View view) { 462 public void onClick(View view) {
463 connectToRoom(roomEditText.getText().toString(), false, false, 0); 463 connectToRoom(roomEditText.getText().toString(), false, false, 0);
464 } 464 }
465 }; 465 };
466 } 466 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698