Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dab5588e authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by Android (Google) Code Review
Browse files

Merge "Address missed comments from previous CL" into rvc-dev

parents 4b23ea8b 48468035

core/java/android/view/SurfaceControl.java

+1 −1
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ public final class SurfaceControl implements Parcelable { 
            int transformHint);



    @Nullable

    @GuardedBy("sLock")

    @GuardedBy("mLock")

    private ArrayList<OnReparentListener> mReparentListeners;



    /**

core/java/android/view/SurfaceView.java

+1 −1
Original line number Diff line number Diff line
@@ -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 */

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

+1 −2
Original line number Diff line number Diff line
@@ -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);

        }

    };