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

Merge "Make sure to reconfigure the ratio on resume" into udc-dev

Browse Source
This commit is contained in:
John Reck
2023-03-03 01:11:23 +00:00
committed by Android (Google) Code Review
parent a9690cc87a 7fa374ed83
commit c48d1d61e6
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/view/ViewRootImpl.java
View File

@@ -1650,6 +1650,7 @@ public final class ViewRootImpl implements ViewParent,
mAttachInfo.mThreadedRenderer = renderer; mAttachInfo.mThreadedRenderer = renderer;
renderer.setSurfaceControl(mSurfaceControl, mBlastBufferQueue); renderer.setSurfaceControl(mSurfaceControl, mBlastBufferQueue);
updateColorModeIfNeeded(attrs.getColorMode()); updateColorModeIfNeeded(attrs.getColorMode());
updateRenderHdrSdrRatio();
updateForceDarkMode(); updateForceDarkMode();
mAttachInfo.mHardwareAccelerated = true; mAttachInfo.mHardwareAccelerated = true;
mAttachInfo.mHardwareAccelerationRequested = true; mAttachInfo.mHardwareAccelerationRequested = true;
@@ -5379,6 +5380,11 @@ public final class ViewRootImpl implements ViewParent,
} }
} }
private void updateRenderHdrSdrRatio() {
mRenderHdrSdrRatio = mDisplay.getHdrSdrRatio();
mUpdateHdrSdrRatioInfo = true;
}
private void updateColorModeIfNeeded(@ActivityInfo.ColorMode int colorMode) { private void updateColorModeIfNeeded(@ActivityInfo.ColorMode int colorMode) {
if (mAttachInfo.mThreadedRenderer == null) { if (mAttachInfo.mThreadedRenderer == null) {
return; return;
@@ -5396,8 +5402,7 @@ public final class ViewRootImpl implements ViewParent,
float desiredRatio = mAttachInfo.mThreadedRenderer.setColorMode(colorMode); float desiredRatio = mAttachInfo.mThreadedRenderer.setColorMode(colorMode);
if (desiredRatio != mDesiredHdrSdrRatio) { if (desiredRatio != mDesiredHdrSdrRatio) {
mDesiredHdrSdrRatio = desiredRatio; mDesiredHdrSdrRatio = desiredRatio;
mRenderHdrSdrRatio = mDisplay.getHdrSdrRatio(); updateRenderHdrSdrRatio();
mUpdateHdrSdrRatioInfo = true;
if (mDesiredHdrSdrRatio < 1.01f) { if (mDesiredHdrSdrRatio < 1.01f) {
mDisplay.unregisterHdrSdrRatioChangedListener(mHdrSdrRatioChangedListener); mDisplay.unregisterHdrSdrRatioChangedListener(mHdrSdrRatioChangedListener);
@@ -8496,6 +8501,7 @@ public final class ViewRootImpl implements ViewParent,
if (mAttachInfo.mThreadedRenderer != null) { if (mAttachInfo.mThreadedRenderer != null) {
mAttachInfo.mThreadedRenderer.setSurfaceControl(mSurfaceControl, mBlastBufferQueue); mAttachInfo.mThreadedRenderer.setSurfaceControl(mSurfaceControl, mBlastBufferQueue);
} }
updateRenderHdrSdrRatio();
if (mPreviousTransformHint != transformHint) { if (mPreviousTransformHint != transformHint) {
mPreviousTransformHint = transformHint; mPreviousTransformHint = transformHint;
dispatchTransformHintChanged(transformHint); dispatchTransformHintChanged(transformHint);