Merge "Support clipping in InlineContentView" into rvc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
449851f8e2
@@ -20,6 +20,7 @@ import android.annotation.NonNull;
|
|||||||
import android.annotation.Nullable;
|
import android.annotation.Nullable;
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.graphics.PixelFormat;
|
import android.graphics.PixelFormat;
|
||||||
|
import android.graphics.Rect;
|
||||||
import android.util.AttributeSet;
|
import android.util.AttributeSet;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
import android.view.SurfaceControl;
|
import android.view.SurfaceControl;
|
||||||
@@ -164,6 +165,7 @@ public class InlineContentView extends ViewGroup {
|
|||||||
public InlineContentView(@NonNull Context context, @Nullable AttributeSet attrs,
|
public InlineContentView(@NonNull Context context, @Nullable AttributeSet attrs,
|
||||||
int defStyleAttr) {
|
int defStyleAttr) {
|
||||||
this(context, attrs, defStyleAttr, 0);
|
this(context, attrs, defStyleAttr, 0);
|
||||||
|
mSurfaceView.setEnableSurfaceClipping(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -177,6 +179,12 @@ public class InlineContentView extends ViewGroup {
|
|||||||
return mSurfaceView.getSurfaceControl();
|
return mSurfaceView.getSurfaceControl();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setClipBounds(Rect clipBounds) {
|
||||||
|
super.setClipBounds(clipBounds);
|
||||||
|
mSurfaceView.setClipBounds(clipBounds);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @inheritDoc
|
* @inheritDoc
|
||||||
* @hide
|
* @hide
|
||||||
|
|||||||
Reference in New Issue
Block a user