diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2020-06-24 16:58:15 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-06-24 16:58:15 +0000 |
| commit | dab5588e84d6ff95b6514493d897f450672c9c0e (patch) | |
| tree | c5366859d50f68025ceb6808a0c84ccdb14f2ea8 /core/java/android | |
| parent | 4b23ea8b74d3800c1d8332f550075e0de1b6b611 (diff) | |
| parent | 4846803547fb9e6bae78954ba7183551b3f34c9d (diff) | |
Merge "Address missed comments from previous CL" into rvc-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/view/SurfaceControl.java | 2 | ||||
| -rw-r--r-- | core/java/android/view/SurfaceView.java | 2 | ||||
| -rw-r--r-- | 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<OnReparentListener> 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); } }; |