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

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

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

Change-Id: I3c06b00ffd1c67e93d77f1e6f52b202fd555d777
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Sally Qi
2023-06-07 20:07:28 +00:00
committed by Automerger Merge Worker
parent 6b2c449539 295fa31d11
commit ade7e5e6b7
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5460,7 +5460,7 @@ public final class ViewRootImpl implements ViewParent,
}
private void updateRenderHdrSdrRatio() {
mRenderHdrSdrRatio = mDisplay.getHdrSdrRatio();
mRenderHdrSdrRatio = Math.min(mDesiredHdrSdrRatio, mDisplay.getHdrSdrRatio());
mUpdateHdrSdrRatioInfo = true;
}
@@ -5488,22 +5488,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) {