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

Commit 295fa31d authored by Sally Qi's avatar Sally Qi Committed by Automerger Merge Worker
Browse files

Merge "Fix HDR blownout issue in the Photos app with HDR display on." into udc-dev am: 059a0275 

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



Change-Id: I7ad71426e2ff9338ae960eb9288605928c7a2ef9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a4b334cf 059a0275

core/java/android/view/ViewRootImpl.java

+3 −11
Original line number Diff line number Diff line
@@ -5459,7 +5459,7 @@ public final class ViewRootImpl implements ViewParent, 
    }



    private void updateRenderHdrSdrRatio() {

        mRenderHdrSdrRatio = mDisplay.getHdrSdrRatio();

        mRenderHdrSdrRatio = Math.min(mDesiredHdrSdrRatio, mDisplay.getHdrSdrRatio());

        mUpdateHdrSdrRatioInfo = true;

    }
@@ -5487,22 +5487,14 @@ public final class ViewRootImpl implements ViewParent, 
                mHdrSdrRatioChangedListener = null;

            } else {

                mHdrSdrRatioChangedListener = display -> {

                    setTargetHdrSdrRatio(display.getHdrSdrRatio());

                    updateRenderHdrSdrRatio();

                    invalidate();

                };

                mDisplay.registerHdrSdrRatioChangedListener(mExecutor, mHdrSdrRatioChangedListener);

            }

        }

    }



    /** happylint */

    public void setTargetHdrSdrRatio(float ratio) {

        if (mRenderHdrSdrRatio != ratio) {

            mRenderHdrSdrRatio = ratio;

            mUpdateHdrSdrRatioInfo = true;

            invalidate();

        }

    }



    @Override

    public void requestChildFocus(View child, View focused) {

        if (DEBUG_INPUT_RESIZE) {