commit 9c71148852068554c191451d05bcc3de23b9fcc0
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Jun 25 05:15:24 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 25 05:15:24 2020 +0000
tree 6c8517b91b16c70578e8ab8bb1541e97ad215b2b
parent 1f7c4db51364a3f1185937eb3cb8a99ecb03240e
parent db0dbea1908930c5ec3bddd5d2889ddfef7e818b

Merge "Fix the visibility of SurfaceView in InlineContentView." into rvc-dev

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

diff --git a/core/java/android/widget/inline/InlineContentView.java b/core/java/android/widget/inline/InlineContentView.java
index 1b666aa..9712311 100644
--- a/core/java/android/widget/inline/InlineContentView.java
+++ b/core/java/android/widget/inline/InlineContentView.java
@@ -21,8 +21,8 @@
 import android.annotation.TestApi;
 import android.content.Context;
 import android.graphics.PixelFormat;
-import android.graphics.Rect;
 import android.graphics.PointF;
+import android.graphics.Rect;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.SurfaceControl;
@@ -156,7 +156,8 @@
         @Override
         public void onDraw() {
             computeParentPositionAndScale();
-            mSurfaceView.setVisibility(VISIBLE);
+            final int visibility = InlineContentView.this.isShown() ? VISIBLE : GONE;
+            mSurfaceView.setVisibility(visibility);
         }
     };