From fcf97c3b75f9f6719d3fb833a8fe95b33a444859 Mon Sep 17 00:00:00 2001
From: sakal <sakal@webrtc.org>
Date: Tue, 18 Jul 2017 05:01:08 -0700
Subject: [PATCH] Fix fullscreen scaling in AppRTCMobile.

The surface view renderer size was set to match parent so it couldn't
adjust based on the frame size. The size is now set to wrap_content
which allows the renderer to adjust. The root element of the call
activity is changed to FrameLayout to allow the renderer to center.

requestLayout is added to SurfaceView setScalingType so onMeasure gets
called again.

BUG=webrtc:7901

Review-Url: https://codereview.webrtc.org/2978173002
Cr-Commit-Position: refs/heads/master@{#19073}
---
 .../androidapp/res/layout/activity_call.xml      | 16 ++++++++++++----
 .../api/org/webrtc/SurfaceViewRenderer.java      |  2 ++
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/webrtc/examples/androidapp/res/layout/activity_call.xml b/webrtc/examples/androidapp/res/layout/activity_call.xml
index fdfe9b17e7..bf811426f3 100644
--- a/webrtc/examples/androidapp/res/layout/activity_call.xml
+++ b/webrtc/examples/androidapp/res/layout/activity_call.xml
@@ -1,11 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
+<!-- tools:ignore is needed because lint thinks this can be replaced with a merge. Replacing this
+     with a merge causes the fullscreen SurfaceView not to be centered. -->
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:ignore="MergeRootFrame">
 
     <org.webrtc.SurfaceViewRenderer
         android:id="@+id/fullscreen_video_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center" />
 
     <org.webrtc.SurfaceViewRenderer
         android:id="@+id/pip_video_view"
@@ -23,4 +31,4 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
-</merge>
+</FrameLayout>
diff --git a/webrtc/sdk/android/api/org/webrtc/SurfaceViewRenderer.java b/webrtc/sdk/android/api/org/webrtc/SurfaceViewRenderer.java
index 67b41fa9f9..06d72425a8 100644
--- a/webrtc/sdk/android/api/org/webrtc/SurfaceViewRenderer.java
+++ b/webrtc/sdk/android/api/org/webrtc/SurfaceViewRenderer.java
@@ -164,12 +164,14 @@ public class SurfaceViewRenderer
   public void setScalingType(RendererCommon.ScalingType scalingType) {
     ThreadUtils.checkIsOnMainThread();
     videoLayoutMeasure.setScalingType(scalingType);
+    requestLayout();
   }
 
   public void setScalingType(RendererCommon.ScalingType scalingTypeMatchOrientation,
       RendererCommon.ScalingType scalingTypeMismatchOrientation) {
     ThreadUtils.checkIsOnMainThread();
     videoLayoutMeasure.setScalingType(scalingTypeMatchOrientation, scalingTypeMismatchOrientation);
+    requestLayout();
   }
 
   /**