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

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

Change-Id: I00b53529d8bb05588cfbb19cc613025c1c83795c
This commit is contained in:
Brett Chabot
2021-11-03 18:12:33 +00:00
committed by Automerger Merge Worker
parent beaf2171c2 a90cb087c0
commit d7a1549e2d
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

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

7
libs/hwui/Properties.h
View File

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