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

Commit 30908fc3 authored by John Reck's avatar John Reck Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: Idd9fc071995594745547c33662aa1a18cdce146d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2995373b c48d1d61

core/java/android/view/ViewRootImpl.java

+8 −2
Original line number Diff line number Diff line
@@ -1650,6 +1650,7 @@ public final class ViewRootImpl implements ViewParent, 
                mAttachInfo.mThreadedRenderer = renderer;

                renderer.setSurfaceControl(mSurfaceControl, mBlastBufferQueue);

                updateColorModeIfNeeded(attrs.getColorMode());

                updateRenderHdrSdrRatio();

                updateForceDarkMode();

                mAttachInfo.mHardwareAccelerated = 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) {

        if (mAttachInfo.mThreadedRenderer == null) {

            return;
@@ -5396,8 +5402,7 @@ public final class ViewRootImpl implements ViewParent, 
        float desiredRatio = mAttachInfo.mThreadedRenderer.setColorMode(colorMode);

        if (desiredRatio != mDesiredHdrSdrRatio) {

            mDesiredHdrSdrRatio = desiredRatio;

            mRenderHdrSdrRatio = mDisplay.getHdrSdrRatio();

            mUpdateHdrSdrRatioInfo = true;

            updateRenderHdrSdrRatio();



            if (mDesiredHdrSdrRatio < 1.01f) {

                mDisplay.unregisterHdrSdrRatioChangedListener(mHdrSdrRatioChangedListener);
@@ -8496,6 +8501,7 @@ public final class ViewRootImpl implements ViewParent, 
            if (mAttachInfo.mThreadedRenderer != null) {

                mAttachInfo.mThreadedRenderer.setSurfaceControl(mSurfaceControl, mBlastBufferQueue);

            }

            updateRenderHdrSdrRatio();

            if (mPreviousTransformHint != transformHint) {

                mPreviousTransformHint = transformHint;

                dispatchTransformHintChanged(transformHint);