Merge "Fix the visibility of SurfaceView in InlineContentView." into rvc-dev am: 9c71148852

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

Change-Id: Ibd355dd33759f9a6d930fffaae7fa2d2a26140df
This commit is contained in:
TreeHugger Robot
2020-06-25 05:29:59 +00:00
committed by Automerger Merge Worker

View File

@@ -21,8 +21,8 @@ import android.annotation.Nullable;
import android.annotation.TestApi; import android.annotation.TestApi;
import android.content.Context; import android.content.Context;
import android.graphics.PixelFormat; import android.graphics.PixelFormat;
import android.graphics.Rect;
import android.graphics.PointF; import android.graphics.PointF;
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;
@@ -156,7 +156,8 @@ public class InlineContentView extends ViewGroup {
@Override @Override
public void onDraw() { public void onDraw() {
computeParentPositionAndScale(); computeParentPositionAndScale();
mSurfaceView.setVisibility(VISIBLE); final int visibility = InlineContentView.this.isShown() ? VISIBLE : GONE;
mSurfaceView.setVisibility(visibility);
} }
}; };