Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I821c8c94bae974fcd1ad00dc3ec3a0f90ffe8cb9
This commit is contained in:
Tyler Gunn
2021-06-15 16:21:00 +00:00
committed by Automerger Merge Worker
parent 6327b51461 6cf21bae3b
commit 9d0f657ddc
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
telecomm/java/android/telecom/Connection.java
View File

@@ -1718,11 +1718,13 @@ public abstract class Connection extends Conferenceable {
public abstract void onSetDeviceOrientation(int rotation); public abstract void onSetDeviceOrientation(int rotation);
/** /**
* Sets camera zoom ratio. * Sets the camera zoom ratio.
* <p> * <p>
* Sent from the {@link InCallService} via {@link InCallService.VideoCall#setZoom(float)}. * 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); public abstract void onSetZoom(float value);

6
telecomm/java/android/telecom/InCallService.java
View File

@@ -764,11 +764,13 @@ public abstract class InCallService extends Service {
public abstract void setDeviceOrientation(int rotation); public abstract void setDeviceOrientation(int rotation);
/** /**
* Sets camera zoom ratio. * Sets the camera zoom ratio.
* <p> * <p>
* Handled by {@link Connection.VideoProvider#onSetZoom(float)}. * 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); public abstract void setZoom(float value);