| OLD | NEW |
| 1 <?xml version="1.0" encoding="utf-8"?> | 1 <?xml version="1.0" encoding="utf-8"?> |
| 2 | 2 |
| 3 <merge xmlns:android="http://schemas.android.com/apk/res/android"> | 3 <!-- tools:ignore is needed because lint thinks this can be replaced with a merg
e. Replacing this |
| 4 with a merge causes the fullscreen SurfaceView not to be centered. --> |
| 5 <FrameLayout |
| 6 xmlns:android="http://schemas.android.com/apk/res/android" |
| 7 xmlns:tools="http://schemas.android.com/tools" |
| 8 android:layout_width="match_parent" |
| 9 android:layout_height="match_parent" |
| 10 tools:ignore="MergeRootFrame"> |
| 4 | 11 |
| 5 <org.webrtc.SurfaceViewRenderer | 12 <org.webrtc.SurfaceViewRenderer |
| 6 android:id="@+id/fullscreen_video_view" | 13 android:id="@+id/fullscreen_video_view" |
| 7 android:layout_width="match_parent" | 14 android:layout_width="wrap_content" |
| 8 android:layout_height="match_parent" /> | 15 android:layout_height="wrap_content" |
| 16 android:layout_gravity="center" /> |
| 9 | 17 |
| 10 <org.webrtc.SurfaceViewRenderer | 18 <org.webrtc.SurfaceViewRenderer |
| 11 android:id="@+id/pip_video_view" | 19 android:id="@+id/pip_video_view" |
| 12 android:layout_height="144dp" | 20 android:layout_height="144dp" |
| 13 android:layout_width="wrap_content" | 21 android:layout_width="wrap_content" |
| 14 android:layout_gravity="bottom|end" | 22 android:layout_gravity="bottom|end" |
| 15 android:layout_margin="16dp"/> | 23 android:layout_margin="16dp"/> |
| 16 | 24 |
| 17 <FrameLayout | 25 <FrameLayout |
| 18 android:id="@+id/call_fragment_container" | 26 android:id="@+id/call_fragment_container" |
| 19 android:layout_width="match_parent" | 27 android:layout_width="match_parent" |
| 20 android:layout_height="match_parent" /> | 28 android:layout_height="match_parent" /> |
| 21 <FrameLayout | 29 <FrameLayout |
| 22 android:id="@+id/hud_fragment_container" | 30 android:id="@+id/hud_fragment_container" |
| 23 android:layout_width="match_parent" | 31 android:layout_width="match_parent" |
| 24 android:layout_height="match_parent" /> | 32 android:layout_height="match_parent" /> |
| 25 | 33 |
| 26 </merge> | 34 </FrameLayout> |
| OLD | NEW |