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

Commit 9d0f657d authored by Tyler Gunn's avatar Tyler Gunn Committed by Automerger Merge Worker
Browse files

Merge "Clarify the video API "setZoom" ratio." am: 6cf21bae 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1737273

Change-Id: I821c8c94bae974fcd1ad00dc3ec3a0f90ffe8cb9
parents 6327b514 6cf21bae

telecomm/java/android/telecom/Connection.java

+4 −2
Original line number Diff line number Diff line
@@ -1718,11 +1718,13 @@ public abstract class Connection extends Conferenceable { 
        public abstract void onSetDeviceOrientation(int rotation);



        /**

         * Sets camera zoom ratio.

         * Sets the camera zoom ratio.

         * <p>

         * Sent from the {@link InCallService} via {@link InCallService.VideoCall#setZoom(float)}.

         *

         * @param value The camera zoom ratio.

         * @param value The camera zoom ratio; for the current camera, should be a value in the

         * range defined by

         * {@link android.hardware.camera2.CameraCharacteristics#CONTROL_ZOOM_RATIO_RANGE}.

         */

        public abstract void onSetZoom(float value);

telecomm/java/android/telecom/InCallService.java

+4 −2
Original line number Diff line number Diff line
@@ -764,11 +764,13 @@ public abstract class InCallService extends Service { 
        public abstract void setDeviceOrientation(int rotation);



        /**

         * Sets camera zoom ratio.

         * Sets the camera zoom ratio.

         * <p>

         * Handled by {@link Connection.VideoProvider#onSetZoom(float)}.

         *

         * @param value The camera zoom ratio.

         * @param value The camera zoom ratio; for the current camera, should be a value in the

         * range defined by

         * {@link android.hardware.camera2.CameraCharacteristics#CONTROL_ZOOM_RATIO_RANGE}.

         */

        public abstract void setZoom(float value);