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

Commit 59bd3059 authored by Brett Chabot's avatar Brett Chabot Committed by Automerger Merge Worker
Browse files

Merge changes from topic "cp_slim" am: a90cb087 am: d7a1549e 

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

Change-Id: I44575c0fe283db60f0ab596d029b855f5bf48b64
parents c2810b93 d7a1549e

libs/hwui/Properties.cpp

+9 −11
Original line number Diff line number Diff line
@@ -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

libs/hwui/Properties.h

+3 −4
Original line number Diff line number Diff line
@@ -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);