summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorQi (wangqi) Wang <wangqi@google.com>2020-06-24 19:42:20 -0700
committerQi (wangqi) Wang <wangqi@google.com>2020-06-24 19:45:46 -0700
commitdb0dbea1908930c5ec3bddd5d2889ddfef7e818b (patch)
tree624f54af3432a87afc6acb6ecc6cf8bd4fa0c841 /core/java
parentd06ebaeeedaad2545d9306f06d8a3c02a5a820ba (diff)
Fix the visibility of SurfaceView in InlineContentView.
SurfaceView doesn't respect the visibility of its ancestor so we need to update it accordingly inside InlineContentView. Test: manually Bug: 158714351 Change-Id: If482747d6ae5d7628b46de837c11b6232406120c
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/widget/inline/InlineContentView.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/widget/inline/InlineContentView.java b/core/java/android/widget/inline/InlineContentView.java
index 1b666aa67e90..9712311aab7c 100644
--- a/core/java/android/widget/inline/InlineContentView.java
+++ b/core/java/android/widget/inline/InlineContentView.java
@@ -21,8 +21,8 @@ import android.annotation.Nullable;
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 @@ public class InlineContentView extends ViewGroup {
@Override
public void onDraw() {
computeParentPositionAndScale();
- mSurfaceView.setVisibility(VISIBLE);
+ final int visibility = InlineContentView.this.isShown() ? VISIBLE : GONE;
+ mSurfaceView.setVisibility(visibility);
}
};