Merge "Cleanup FLAG_LIMITED_HDR" into main (68cca32d) · Commits · e / os / android_frameworks_base

core/api/current.txt

+6 −6

Original line number	Diff line number	Diff line
		@@ -53757,7 +53757,7 @@ package android.view {
		method @NonNull public android.view.SurfaceControl.Transaction setCrop(@NonNull android.view.SurfaceControl, @Nullable android.graphics.Rect);
		method @NonNull public android.view.SurfaceControl.Transaction setDamageRegion(@NonNull android.view.SurfaceControl, @Nullable android.graphics.Region);
		method @NonNull public android.view.SurfaceControl.Transaction setDataSpace(@NonNull android.view.SurfaceControl, int);
		method @FlaggedApi("com.android.graphics.hwui.flags.limited_hdr") @NonNull public android.view.SurfaceControl.Transaction setDesiredHdrHeadroom(@NonNull android.view.SurfaceControl, @FloatRange(from=0.0f) float);
		method @NonNull public android.view.SurfaceControl.Transaction setDesiredHdrHeadroom(@NonNull android.view.SurfaceControl, @FloatRange(from=0.0f) float);
		method @FlaggedApi("com.android.window.flags.sdk_desired_present_time") @NonNull public android.view.SurfaceControl.Transaction setDesiredPresentTimeNanos(long);
		method @NonNull public android.view.SurfaceControl.Transaction setExtendedRangeBrightness(@NonNull android.view.SurfaceControl, float, float);
		method @NonNull public android.view.SurfaceControl.Transaction setFrameRate(@NonNull android.view.SurfaceControl, @FloatRange(from=0.0) float, int);
		@@ -53867,7 +53867,7 @@ package android.view {
		method public android.view.SurfaceControl getSurfaceControl();
		method public void setChildSurfacePackage(@NonNull android.view.SurfaceControlViewHost.SurfacePackage);
		method @FlaggedApi("android.view.flags.surface_view_set_composition_order") public void setCompositionOrder(int);
		method @FlaggedApi("com.android.graphics.hwui.flags.limited_hdr") public void setDesiredHdrHeadroom(@FloatRange(from=0.0f, to=10000.0) float);
		method public void setDesiredHdrHeadroom(@FloatRange(from=0.0f, to=10000.0) float);
		method public void setSecure(boolean);
		method public void setSurfaceLifecycle(int);
		method @Deprecated @FlaggedApi("android.view.flags.deprecate_surface_view_z_order_apis") public void setZOrderMediaOverlay(boolean);
		@@ -55574,7 +55574,7 @@ package android.view {
		method @Nullable public abstract android.view.View getCurrentFocus();
		method @NonNull public abstract android.view.View getDecorView();
		method public static int getDefaultFeatures(android.content.Context);
		method @FlaggedApi("com.android.graphics.hwui.flags.limited_hdr") public float getDesiredHdrHeadroom();
		method public float getDesiredHdrHeadroom();
		method public android.transition.Transition getEnterTransition();
		method public android.transition.Transition getExitTransition();
		method protected final int getFeatures();
		@@ -55646,7 +55646,7 @@ package android.view {
		method public abstract void setDecorCaptionShade(int);
		method @Deprecated public void setDecorFitsSystemWindows(boolean);
		method protected void setDefaultWindowFormat(int);
		method @FlaggedApi("com.android.graphics.hwui.flags.limited_hdr") public void setDesiredHdrHeadroom(@FloatRange(from=0.0f, to=10000.0) float);
		method public void setDesiredHdrHeadroom(@FloatRange(from=0.0f, to=10000.0) float);
		method public void setDimAmount(float);
		method public void setElevation(float);
		method public void setEnterTransition(android.transition.Transition);
		@@ -56024,7 +56024,7 @@ package android.view {
		method public int describeContents();
		method public int getBlurBehindRadius();
		method public int getColorMode();
		method @FlaggedApi("com.android.graphics.hwui.flags.limited_hdr") public float getDesiredHdrHeadroom();
		method public float getDesiredHdrHeadroom();
		method public int getFitInsetsSides();
		method public int getFitInsetsTypes();
		method @FlaggedApi("android.view.flags.toolkit_set_frame_rate_read_only") public boolean getFrameRateBoostOnTouchEnabled();
		@@ -56036,7 +56036,7 @@ package android.view {
		method public void setBlurBehindRadius(@IntRange(from=0) int);
		method public void setCanPlayMoveAnimation(boolean);
		method public void setColorMode(int);
		method @FlaggedApi("com.android.graphics.hwui.flags.limited_hdr") public void setDesiredHdrHeadroom(@FloatRange(from=0.0f, to=10000.0f) float);
		method public void setDesiredHdrHeadroom(@FloatRange(from=0.0f, to=10000.0f) float);
		method public void setFitInsetsIgnoringVisibility(boolean);
		method public void setFitInsetsSides(int);
		method public void setFitInsetsTypes(int);

core/java/android/view/SurfaceControl.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -4837,7 +4837,6 @@ public final class SurfaceControl implements Parcelable {
		* @return this
		* @see #setExtendedRangeBrightness
		**/
		@FlaggedApi(com.android.graphics.hwui.flags.Flags.FLAG_LIMITED_HDR)
		public @NonNull Transaction setDesiredHdrHeadroom(@NonNull SurfaceControl sc,
		@FloatRange(from = 0.0f) float desiredRatio) {
		checkPreconditions(sc);

core/java/android/view/SurfaceView.java

+1 −3

Original line number	Diff line number	Diff line
		@@ -197,7 +197,6 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall
		boolean mDrawFinished = false;

		final Rect mScreenRect = new Rect();
		private final boolean mLimitedHdrEnabled = Flags.limitedHdr();

		SurfaceControl mSurfaceControl;
		SurfaceControl mBackgroundControl;
		@@ -999,7 +998,6 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall
		* chosen value.
		* @see Display#getHdrSdrRatio()
		*/
		@FlaggedApi(com.android.graphics.hwui.flags.Flags.FLAG_LIMITED_HDR)
		public void setDesiredHdrHeadroom(
		@FloatRange(from = 0.0f, to = 10000.0) float desiredHeadroom) {
		if (!Float.isFinite(desiredHeadroom)) {
		@@ -1131,7 +1129,7 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall

		updateBackgroundVisibility(surfaceUpdateTransaction);
		updateBackgroundColor(surfaceUpdateTransaction);
		if (mLimitedHdrEnabled && (hdrHeadroomChanged \|\| creating)) {
		if (hdrHeadroomChanged \|\| creating) {
		surfaceUpdateTransaction.setDesiredHdrHeadroom(
		mBlastSurfaceControl, mHdrHeadroom);
		}

core/java/android/view/Window.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -1439,7 +1439,6 @@ public abstract class Window {
		* @see #getDesiredHdrHeadroom()
		* @see Display#getHdrSdrRatio()
		*/
		@FlaggedApi(com.android.graphics.hwui.flags.Flags.FLAG_LIMITED_HDR)
		public void setDesiredHdrHeadroom(
		@FloatRange(from = 0.0f, to = 10000.0) float desiredHeadroom) {
		final WindowManager.LayoutParams attrs = getAttributes();
		@@ -1452,7 +1451,6 @@ public abstract class Window {
		* @return The amount of HDR headroom set, or 0 for automatic/default behavior.
		* @see #setDesiredHdrHeadroom(float)
		*/
		@FlaggedApi(com.android.graphics.hwui.flags.Flags.FLAG_LIMITED_HDR)
		public float getDesiredHdrHeadroom() {
		return getAttributes().getDesiredHdrHeadroom();
		}

core/java/android/view/WindowManager.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -5154,7 +5154,6 @@ public interface WindowManager extends ViewManager {
		* @param desiredHeadroom Desired amount of HDR headroom. Must be in the range of 1.0 (SDR)
		* to 10,000.0, or 0.0 to reset to default.
		*/
		@FlaggedApi(com.android.graphics.hwui.flags.Flags.FLAG_LIMITED_HDR)
		public void setDesiredHdrHeadroom(
		@FloatRange(from = 0.0f, to = 10000.0f) float desiredHeadroom) {
		if (!Float.isFinite(desiredHeadroom)) {
		@@ -5173,7 +5172,6 @@ public interface WindowManager extends ViewManager {
		* Get the desired amount of HDR headroom as set by {@link #setDesiredHdrHeadroom(float)}
		* @return The amount of HDR headroom set, or 0 for automatic/default behavior.
		*/
		@FlaggedApi(com.android.graphics.hwui.flags.Flags.FLAG_LIMITED_HDR)
		public float getDesiredHdrHeadroom() {
		return mDesiredHdrHeadroom;
		}