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

Commit 0810d196 authored Dec 04, 2020 by android-build-team Robot

Snap for 7010201 from d965659a to rvc-qpr2-release

Change-Id: I55a6941c4a2fe2584143e10aa6215e8725098f59

parents 420c0bd1 d965659a

core/java/android/app/Activity.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -5195,8 +5195,8 @@ public class Activity extends ContextThemeWrapper
		* result callbacks including {@link #onRequestPermissionsResult(int, String[], int[])}.
		* </p>
		* <p>
		* The <a href="https://github.com/googlesamples/android-RuntimePermissions">
		* RuntimePermissions</a> sample app demonstrates how to use this method to
		* The <a href="https://github.com/android/permissions-samples">
		* RuntimePermissions</a> sample apps demonstrate how to use this method to
		* request permissions at run time.
		* </p>
		*

core/java/android/hardware/camera2/CameraCharacteristics.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -2771,7 +2771,9 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
		* </ol>
		* </li>
		* <li>Setting {@link CaptureRequest#CONTROL_ZOOM_RATIO android.control.zoomRatio} to values different than 1.0 and
		* {@link CaptureRequest#SCALER_CROP_REGION android.scaler.cropRegion} to be windowboxing at the same time is undefined behavior.</li>
		* {@link CaptureRequest#SCALER_CROP_REGION android.scaler.cropRegion} to be windowboxing at the same time are not supported. In this
		* case, the camera framework will override the {@link CaptureRequest#SCALER_CROP_REGION android.scaler.cropRegion} to be the active
		* array.</li>
		* </ul>
		* <p>LEGACY capability devices will only support CENTER_ONLY cropping.</p>
		* <p><b>Possible values:</b>

core/java/android/hardware/camera2/CaptureRequest.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -2242,7 +2242,10 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>>
		* explicitly set {@link CaptureRequest#CONTROL_ZOOM_RATIO android.control.zoomRatio}, its value defaults to 1.0.</p>
		* <p>One limitation of controlling zoom using zoomRatio is that the {@link CaptureRequest#SCALER_CROP_REGION android.scaler.cropRegion}
		* must only be used for letterboxing or pillarboxing of the sensor active array, and no
		* FREEFORM cropping can be used with {@link CaptureRequest#CONTROL_ZOOM_RATIO android.control.zoomRatio} other than 1.0.</p>
		* FREEFORM cropping can be used with {@link CaptureRequest#CONTROL_ZOOM_RATIO android.control.zoomRatio} other than 1.0. If
		* {@link CaptureRequest#CONTROL_ZOOM_RATIO android.control.zoomRatio} is not 1.0, and {@link CaptureRequest#SCALER_CROP_REGION android.scaler.cropRegion} is set to be
		* windowboxing, the camera framework will override the {@link CaptureRequest#SCALER_CROP_REGION android.scaler.cropRegion} to be
		* the active array.</p>
		* <p><b>Range of valid values:</b><br>
		* {@link CameraCharacteristics#CONTROL_ZOOM_RATIO_RANGE android.control.zoomRatioRange}</p>
		* <p><b>Optional</b> - The value for this key may be {@code null} on some devices.</p>

core/java/android/hardware/camera2/CaptureResult.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -2472,7 +2472,10 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> {
		* explicitly set {@link CaptureRequest#CONTROL_ZOOM_RATIO android.control.zoomRatio}, its value defaults to 1.0.</p>
		* <p>One limitation of controlling zoom using zoomRatio is that the {@link CaptureRequest#SCALER_CROP_REGION android.scaler.cropRegion}
		* must only be used for letterboxing or pillarboxing of the sensor active array, and no
		* FREEFORM cropping can be used with {@link CaptureRequest#CONTROL_ZOOM_RATIO android.control.zoomRatio} other than 1.0.</p>
		* FREEFORM cropping can be used with {@link CaptureRequest#CONTROL_ZOOM_RATIO android.control.zoomRatio} other than 1.0. If
		* {@link CaptureRequest#CONTROL_ZOOM_RATIO android.control.zoomRatio} is not 1.0, and {@link CaptureRequest#SCALER_CROP_REGION android.scaler.cropRegion} is set to be
		* windowboxing, the camera framework will override the {@link CaptureRequest#SCALER_CROP_REGION android.scaler.cropRegion} to be
		* the active array.</p>
		* <p><b>Range of valid values:</b><br>
		* {@link CameraCharacteristics#CONTROL_ZOOM_RATIO_RANGE android.control.zoomRatioRange}</p>
		* <p><b>Optional</b> - The value for this key may be {@code null} on some devices.</p>

packages/SettingsLib/res/values-uz/strings.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -429,8 +429,8 @@
		<skip />
		<string name="power_discharge_by_enhanced" msgid="563438403581662942">"Joriy holatda taxminan <xliff:g id="TIME">%1$s</xliff:g> gacha davom etadi (<xliff:g id="LEVEL">%2$s</xliff:g>)"</string>
		<string name="power_discharge_by_only_enhanced" msgid="3268796172652988877">"Joriy holatda taxminan <xliff:g id="TIME">%1$s</xliff:g> gacha davom etadi"</string>
		<string name="power_discharge_by" msgid="4113180890060388350">"Taxminan <xliff:g id="TIME">%1$s</xliff:g> gacha davom etadi (<xliff:g id="LEVEL">%2$s</xliff:g>)"</string>
		<string name="power_discharge_by_only" msgid="92545648425937000">"Taxminan <xliff:g id="TIME">%1$s</xliff:g> gacha davom etadi"</string>
		<string name="power_discharge_by" msgid="4113180890060388350">"Taxminan <xliff:g id="TIME">%1$s</xliff:g> gacha yetadi (<xliff:g id="LEVEL">%2$s</xliff:g>)"</string>
		<string name="power_discharge_by_only" msgid="92545648425937000">"Taxminan <xliff:g id="TIME">%1$s</xliff:g> gacha yetadi"</string>
		<string name="power_discharge_by_only_short" msgid="5883041507426914446">"<xliff:g id="TIME">%1$s</xliff:g> gacha"</string>
		<string name="power_suggestion_battery_run_out" msgid="6332089307827787087">"Batareya quvvati tugash vaqti: <xliff:g id="TIME">%1$s</xliff:g>"</string>
		<string name="power_remaining_less_than_duration_only" msgid="8956656616031395152">"<xliff:g id="THRESHOLD">%1$s</xliff:g>dan kam qoldi"</string>