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

Merge changes from topic "cp_slim" am: a90cb087c0 am: d7a1549e2d

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

Change-Id: I44575c0fe283db60f0ab596d029b855f5bf48b64
This commit is contained in:
Brett Chabot
2021-11-03 18:27:47 +00:00
committed by Automerger Merge Worker
parent c2810b9385 d7a1549e2d
commit 59bd3059cc
2 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libs/hwui/Properties.cpp
View File

@@ -89,8 +89,7 @@ bool Properties::enableWebViewOverlays = true;
StretchEffectBehavior Properties::stretchEffectBehavior = StretchEffectBehavior::ShaderHWUI;
bool Properties::drawingEnabled = true;
OverrideDrawingEnabled Properties::overrideDrawingEnabled = OverrideDrawingEnabled::Default;
DrawingEnabled Properties::drawingEnabled = DrawingEnabled::NotInitialized;
bool Properties::load() {
bool prevDebugLayersUpdates = debugLayersUpdates;
@@ -145,10 +144,8 @@ bool Properties::load() {
enableWebViewOverlays = base::GetBoolProperty(PROPERTY_WEBVIEW_OVERLAYS_ENABLED, true);
drawingEnabled = base::GetBoolProperty(PROPERTY_DRAWING_ENABLED, true);
if (!drawingEnabled) {
enableRTAnimations = false;
}
// call isDrawingEnabled to force loading of the property
isDrawingEnabled();
return (prevDebugLayersUpdates != debugLayersUpdates) || (prevDebugOverdraw != debugOverdraw);
}
@@ -220,16 +217,17 @@ void Properties::overrideRenderPipelineType(RenderPipelineType type, bool inUnit
}
void Properties::setDrawingEnabled(bool newDrawingEnabled) {
overrideDrawingEnabled =
newDrawingEnabled ? OverrideDrawingEnabled::On : OverrideDrawingEnabled::Off;
drawingEnabled = newDrawingEnabled ? DrawingEnabled::On : DrawingEnabled::Off;
enableRTAnimations = newDrawingEnabled;
}
bool Properties::isDrawingEnabled() {
if (overrideDrawingEnabled == OverrideDrawingEnabled::Default) {
return drawingEnabled;
if (drawingEnabled == DrawingEnabled::NotInitialized) {
bool drawingEnabledProp = base::GetBoolProperty(PROPERTY_DRAWING_ENABLED, true);
drawingEnabled = drawingEnabledProp ? DrawingEnabled::On : DrawingEnabled::Off;
enableRTAnimations = drawingEnabledProp;
}
return overrideDrawingEnabled == OverrideDrawingEnabled::On;
return drawingEnabled == DrawingEnabled::On;
}
} // namespace uirenderer

7
libs/hwui/Properties.h
View File

@@ -214,7 +214,7 @@ enum class StretchEffectBehavior {
UniformScale // Uniform scale stretch everywhere
};
enum class OverrideDrawingEnabled { Default, On, Off };
enum class DrawingEnabled { NotInitialized, On, Off };
/**
* Renderthread-only singleton which manages several static rendering properties. Most of these
@@ -310,9 +310,8 @@ public:
stretchEffectBehavior = behavior;
}
// Represents if GL drawing is enabled. Should only be false in headless testing environments
static bool drawingEnabled;
static OverrideDrawingEnabled overrideDrawingEnabled;
// Represents if drawing is enabled. Should only be Off in headless testing environments
static DrawingEnabled drawingEnabled;
static bool isDrawingEnabled();
static void setDrawingEnabled(bool enable);