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

Commit 23c9cc0c authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

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

Merge "Merge "Address missed comments from previous CL" into rvc-dev am: dab5588e am: d00340e1 am: 43935986" into rvc-qpr-dev-plus-aosp
parents 17e48b97 842f9e3b

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);

        }

    };