webrtc/examples/androidapp/res/layout/activity_call.xml - Issue 2682943006: Add support for swapping feeds in Android AppRTCMobile.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webrtc/examples/androidapp/res/layout/activity_call.xml

Issue 2682943006: Add support for swapping feeds in Android AppRTCMobile. (Closed)

Patch Set: Remove an empty line, add comments. Created 3 years, 10 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « webrtc/examples/androidapp/AndroidManifest.xml ('k') | webrtc/examples/androidapp/src/org/appspot/apprtc/CallActivity.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/examples/androidapp/res/layout/activity_call.xml

diff --git a/webrtc/examples/androidapp/res/layout/activity_call.xml b/webrtc/examples/androidapp/res/layout/activity_call.xml

index 793ed588ad28664b7f3e7ddf33dd17c4adbe7da2..fdfe9b17e77fda38e993fe4cc649f1e7c0724e0c 100644

--- a/webrtc/examples/androidapp/res/layout/activity_call.xml

+++ b/webrtc/examples/androidapp/res/layout/activity_call.xml

@@ -1,29 +1,18 @@

<?xml version="1.0" encoding="utf-8"?>

-<RelativeLayout

- xmlns:android="http://schemas.android.com/apk/res/android"

- android:layout_width="match_parent"

- android:layout_height="match_parent">

+<merge xmlns:android="http://schemas.android.com/apk/res/android">

- <org.appspot.apprtc.PercentFrameLayout

- android:id="@+id/remote_video_layout"

+ <org.webrtc.SurfaceViewRenderer

+ android:id="@+id/fullscreen_video_view"

android:layout_width="match_parent"

- android:layout_height="match_parent">

- <org.webrtc.SurfaceViewRenderer

- android:id="@+id/remote_video_view"

- android:layout_width="wrap_content"

- android:layout_height="wrap_content" />

- </org.appspot.apprtc.PercentFrameLayout>

+ android:layout_height="match_parent" />

- <org.appspot.apprtc.PercentFrameLayout

- android:id="@+id/local_video_layout"

- android:layout_width="match_parent"

- android:layout_height="match_parent">

- <org.webrtc.SurfaceViewRenderer

- android:id="@+id/local_video_view"

- android:layout_width="wrap_content"

- android:layout_height="wrap_content" />

- </org.appspot.apprtc.PercentFrameLayout>

+ <org.webrtc.SurfaceViewRenderer

+ android:id="@+id/pip_video_view"

+ android:layout_height="144dp"

+ android:layout_width="wrap_content"

+ android:layout_gravity="bottom|end"

+ android:layout_margin="16dp"/>

<FrameLayout

android:id="@+id/call_fragment_container"

@@ -34,4 +23,4 @@

android:layout_width="match_parent"

android:layout_height="match_parent" />

-</RelativeLayout>

+</merge>