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

Commit ff0750a8 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 

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

Change-Id: I6b8937c51477953edb3e122dec89fd5f7b4d5e75
parents 505353d6 449851f8

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

+8 −0
Original line number Original line Diff line number Diff line
@@ -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