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

Commit 64ebd3d4 authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by Automerger Merge Worker
Browse files

Merge "Support clipping in InlineContentView" into rvc-dev am: 449851f8 am:... 

Merge "Support clipping in InlineContentView" into rvc-dev am: 449851f8 am: f5e93dec am: d15e6ec7

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11962498

Change-Id: I4f168e458fb779f6d19a4844df1af700cb054504
parents 2110a3cd d15e6ec7

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

+8 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.annotation.NonNull; 
import android.annotation.Nullable;

import android.content.Context;

import android.graphics.PixelFormat;

import android.graphics.Rect;

import android.util.AttributeSet;

import android.util.Log;

import android.view.SurfaceControl;
@@ -164,6 +165,7 @@ public class InlineContentView extends ViewGroup { 
    public InlineContentView(@NonNull Context context, @Nullable AttributeSet attrs,

            int defStyleAttr) {

        this(context, attrs, defStyleAttr, 0);

        mSurfaceView.setEnableSurfaceClipping(true);

    }



    /**
@@ -177,6 +179,12 @@ public class InlineContentView extends ViewGroup { 
        return mSurfaceView.getSurfaceControl();

    }



    @Override

    public void setClipBounds(Rect clipBounds) {

        super.setClipBounds(clipBounds);

        mSurfaceView.setClipBounds(clipBounds);

    }



    /**

     * @inheritDoc

     * @hide