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

Commit 913b220e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Deprecate SurfaceControl.Transaction#setGeometry" into tm-dev

parents f85808dd ba74e4b0

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -49292,7 +49292,7 @@ package android.view { 
    method @NonNull public android.view.SurfaceControl.Transaction setDataSpace(@NonNull android.view.SurfaceControl, int);

    method @NonNull public android.view.SurfaceControl.Transaction setFrameRate(@NonNull android.view.SurfaceControl, @FloatRange(from=0.0) float, int);

    method @NonNull public android.view.SurfaceControl.Transaction setFrameRate(@NonNull android.view.SurfaceControl, @FloatRange(from=0.0) float, int, int);

    method @NonNull public android.view.SurfaceControl.Transaction setGeometry(@NonNull android.view.SurfaceControl, @Nullable android.graphics.Rect, @Nullable android.graphics.Rect, int);

    method @Deprecated @NonNull public android.view.SurfaceControl.Transaction setGeometry(@NonNull android.view.SurfaceControl, @Nullable android.graphics.Rect, @Nullable android.graphics.Rect, int);

    method @NonNull public android.view.SurfaceControl.Transaction setLayer(@NonNull android.view.SurfaceControl, @IntRange(from=java.lang.Integer.MIN_VALUE, to=java.lang.Integer.MAX_VALUE) int);

    method @NonNull public android.view.SurfaceControl.Transaction setOpaque(@NonNull android.view.SurfaceControl, boolean);

    method @NonNull public android.view.SurfaceControl.Transaction setPosition(@NonNull android.view.SurfaceControl, float, float);

core/java/android/view/SurfaceControl.java

+4 −0
Original line number Diff line number Diff line
@@ -3094,6 +3094,10 @@ public final class SurfaceControl implements Parcelable { 
         * @param destFrame The destination rectangle in parent space. Or null for the source frame.

         * @param orientation The buffer rotation

         * @return This transaction object.

         * @deprecated Use {@link #setCrop(SurfaceControl, Rect)},

         * {@link #setBufferTransform(SurfaceControl, int)},

         * {@link #setPosition(SurfaceControl, float, float)} and

         * {@link #setScale(SurfaceControl, float, float)} instead.

         */

        @NonNull

        public Transaction setGeometry(@NonNull SurfaceControl sc, @Nullable Rect sourceCrop,