diff options
| author | 2023-11-08 17:26:20 +0000 | |
|---|---|---|
| committer | 2023-11-08 17:26:20 +0000 | |
| commit | 898fd94fb8c571a623ca047fd4c0b2a0de62fa33 (patch) | |
| tree | 5c7b9949792a089fe8d5f001cf469fa799a3dd5d /libs/hwui/TreeInfo.cpp | |
| parent | f527647494c2fdab2688a4b8265c3c3e25205b1e (diff) | |
| parent | 335677493d7cf19bf8bcbe9d61b902562c2c6b0a (diff) | |
Merge changes from topic "forcedark-ignoreoutoutrendernode" into main
* changes:
fix(force invert): don't let devs opt-out of force dark when force invert is on
refactor(force invert): use enum/intdef for force dark type in setForceDark() functions
Diffstat (limited to 'libs/hwui/TreeInfo.cpp')
| -rw-r--r-- | libs/hwui/TreeInfo.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/hwui/TreeInfo.cpp b/libs/hwui/TreeInfo.cpp index 750f869e2551..717157c09a53 100644 --- a/libs/hwui/TreeInfo.cpp +++ b/libs/hwui/TreeInfo.cpp @@ -24,7 +24,8 @@ TreeInfo::TreeInfo(TraversalMode mode, renderthread::CanvasContext& canvasContex : mode(mode) , prepareTextures(mode == MODE_FULL) , canvasContext(canvasContext) - , disableForceDark(canvasContext.useForceDark() ? 0 : 1) + , disableForceDark(canvasContext.getForceDarkType() == ForceDarkType::NONE ? 1 : 0) + , forceDarkType(canvasContext.getForceDarkType()) , screenSize(canvasContext.getNextFrameSize()) {} } // namespace android::uirenderer |