Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 66a0adb9 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Properly layout InlineContentView" into rvc-dev am: 7f70f707 am: cb5de77e am: 5ad75ef4 

Change-Id: I9f7534bfe35e8d8c0439ee781562cdff27ee2c1f
parents 01d28a5c 5ad75ef4

core/java/android/view/inline/InlineContentView.java

+1 −1
Original line number Diff line number Diff line
@@ -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());

    }



    /**

core/java/android/widget/inline/InlineContentView.java

+5 −1
Original line number Diff line number Diff line
@@ -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());

    }



    /**