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

Commit 2d8ef6c2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "resolve merge conflicts of 3fb651b0 to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp

parents ce600b4e f53bfc91

libs/hwui/AnimationContext.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -57,7 +57,7 @@ public: 




private:

private:

    friend class AnimationContext;

    friend class AnimationContext;

    AnimationHandle(AnimationContext& context);

    explicit AnimationHandle(AnimationContext& context);

    AnimationHandle(RenderNode& animatingNode, AnimationContext& context);

    AnimationHandle(RenderNode& animatingNode, AnimationContext& context);

    ~AnimationHandle();

    ~AnimationHandle();
@@ -75,7 +75,7 @@ private: 
class AnimationContext {

class AnimationContext {

    PREVENT_COPY_AND_ASSIGN(AnimationContext);

    PREVENT_COPY_AND_ASSIGN(AnimationContext);

public:

public:

    ANDROID_API AnimationContext(renderthread::TimeLord& clock);

    ANDROID_API explicit AnimationContext(renderthread::TimeLord& clock);

    ANDROID_API virtual ~AnimationContext();

    ANDROID_API virtual ~AnimationContext();





    nsecs_t frameTimeMs() { return mFrameTimeMs; }

    nsecs_t frameTimeMs() { return mFrameTimeMs; }

libs/hwui/AnimatorManager.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -35,7 +35,7 @@ class TreeInfo; 
class AnimatorManager {

class AnimatorManager {

    PREVENT_COPY_AND_ASSIGN(AnimatorManager);

    PREVENT_COPY_AND_ASSIGN(AnimatorManager);

public:

public:

    AnimatorManager(RenderNode& parent);

    explicit AnimatorManager(RenderNode& parent);

    ~AnimatorManager();

    ~AnimatorManager();





    void addAnimator(const sp<BaseRenderNodeAnimator>& animator);

    void addAnimator(const sp<BaseRenderNodeAnimator>& animator);

libs/hwui/Caches.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -77,7 +77,7 @@ public: 
        return sInstance != nullptr;

        return sInstance != nullptr;

    }

    }

private:

private:

    Caches(RenderState& renderState);

    explicit Caches(RenderState& renderState);

    static Caches* sInstance;

    static Caches* sInstance;





public:

public:

libs/hwui/CanvasProperty.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -28,7 +28,7 @@ namespace uirenderer { 
class CanvasPropertyPrimitive : public VirtualLightRefBase {

class CanvasPropertyPrimitive : public VirtualLightRefBase {

    PREVENT_COPY_AND_ASSIGN(CanvasPropertyPrimitive);

    PREVENT_COPY_AND_ASSIGN(CanvasPropertyPrimitive);

public:

public:

    CanvasPropertyPrimitive(float initialValue) : value(initialValue) {}

    explicit CanvasPropertyPrimitive(float initialValue) : value(initialValue) {}





    float value;

    float value;

};

};
@@ -36,7 +36,7 @@ public: 
class CanvasPropertyPaint : public VirtualLightRefBase {

class CanvasPropertyPaint : public VirtualLightRefBase {

    PREVENT_COPY_AND_ASSIGN(CanvasPropertyPaint);

    PREVENT_COPY_AND_ASSIGN(CanvasPropertyPaint);

public:

public:

    CanvasPropertyPaint(const SkPaint& initialValue) : value(initialValue) {}

    explicit CanvasPropertyPaint(const SkPaint& initialValue) : value(initialValue) {}





    SkPaint value;

    SkPaint value;

};

};

libs/hwui/CanvasState.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -73,7 +73,7 @@ public: 




class CanvasState {

class CanvasState {

public:

public:

    CanvasState(CanvasStateClient& renderer);

    explicit CanvasState(CanvasStateClient& renderer);

    ~CanvasState();

    ~CanvasState();





    /**

    /**