From 4846803547fb9e6bae78954ba7183551b3f34c9d Mon Sep 17 00:00:00 2001 From: Svet Ganov Date: Tue, 23 Jun 2020 23:38:07 -0700 Subject: Address missed comments from previous CL bug:153826463 Test: atest android.widget.cts.inline.InlineContentViewTest#testReparenting Change-Id: Iddb1f4d2e0b7043517616d0ec3678a55f9eda34c --- core/java/android/view/SurfaceControl.java | 2 +- core/java/android/view/SurfaceView.java | 2 +- core/java/android/widget/inline/InlineContentView.java | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/core/java/android/view/SurfaceControl.java b/core/java/android/view/SurfaceControl.java index 9f7c5e46b49a..daeb1c9c1e01 100644 --- a/core/java/android/view/SurfaceControl.java +++ b/core/java/android/view/SurfaceControl.java @@ -229,7 +229,7 @@ public final class SurfaceControl implements Parcelable { int transformHint); @Nullable - @GuardedBy("sLock") + @GuardedBy("mLock") private ArrayList mReparentListeners; /** diff --git a/core/java/android/view/SurfaceView.java b/core/java/android/view/SurfaceView.java index 5b6e5c1acea2..0d21eb5cf920 100644 --- a/core/java/android/view/SurfaceView.java +++ b/core/java/android/view/SurfaceView.java @@ -1231,7 +1231,7 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall float postScaleX, float postScaleY) { transaction.setPosition(surface, positionLeft, positionTop); transaction.setMatrix(surface, postScaleX /*dsdx*/, 0f /*dtdx*/, - 0f /*dsdy*/, postScaleY /*dtdy*/); + 0f /*dtdy*/, postScaleY /*dsdy*/); } /** @hide */ diff --git a/core/java/android/widget/inline/InlineContentView.java b/core/java/android/widget/inline/InlineContentView.java index be7c6966ce38..1b666aa67e90 100644 --- a/core/java/android/widget/inline/InlineContentView.java +++ b/core/java/android/widget/inline/InlineContentView.java @@ -156,8 +156,7 @@ public class InlineContentView extends ViewGroup { @Override public void onDraw() { computeParentPositionAndScale(); - final int visibility = InlineContentView.this.isShown() ? VISIBLE : GONE; - mSurfaceView.setVisibility(visibility); + mSurfaceView.setVisibility(VISIBLE); } }; -- cgit v1.2.3-59-g8ed1b