Merge "Properly layout InlineContentView" into rvc-dev

2 files changed, 6 insertions, 2 deletions

diff --git a/core/java/android/view/inline/InlineContentView.java b/core/java/android/view/inline/InlineContentView.java
index deb93a9a4414..3df201c9145d 100644
--- a/core/java/android/view/inline/InlineContentView.java
+++ b/core/java/android/view/inline/InlineContentView.java
@@ -160,7 +160,7 @@ public class InlineContentView extends ViewGroup {
 
     @Override
     public void onLayout(boolean changed, int l, int t, int r, int b) {
-        mSurfaceView.layout(l, t, r, b);
+        mSurfaceView.layout(0, 0, getMeasuredWidth(), getMeasuredHeight());
     }
 
     /**
diff --git a/core/java/android/widget/inline/InlineContentView.java b/core/java/android/widget/inline/InlineContentView.java
index 16a61fbc567d..4f2af63626cf 100644
--- a/core/java/android/widget/inline/InlineContentView.java
+++ b/core/java/android/widget/inline/InlineContentView.java
@@ -45,6 +45,10 @@ import android.view.ViewGroup;
  * under the hosting window which could be useful in some cases, e.g. animating transitions.
  * At this point the inlined content will not be interactive and the touch events would
  * be delivered to your app.
+ * <p>
+ * Instances of this class are created by the platform and can be programmatically attached
+ * to your UI. Once you attach and detach this view it can not longer be reused and you
+ * should obtain a new view from the platform via the dedicated APIs.
  */
 public class InlineContentView extends ViewGroup {
 
@@ -157,7 +161,7 @@ public class InlineContentView extends ViewGroup {
 
     @Override
     public void onLayout(boolean changed, int l, int t, int r, int b) {
-        mSurfaceView.layout(l, t, r, b);
+        mSurfaceView.layout(0, 0, getMeasuredWidth(), getMeasuredHeight());
     }
 
     /**