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

Commit 71a6ea10 authored by Chris Craik's avatar Chris Craik Committed by android-build-merger
Browse files

Merge "Rebuild outline when setBackground is called." into nyc-dev 

am: 7fb0d094

* commit '7fb0d094':
  Rebuild outline when setBackground is called.
parents 4ad0a983 7fb0d094

core/java/android/view/View.java

+1 −0
Original line number Diff line number Diff line
@@ -18091,6 +18091,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 














        mBackgroundSizeChanged = true;















        invalidate(true);













        invalidateOutline();















    }





























    /**

























libs/hwui/BakedOpRenderer.cpp



+2
−1




























Original line number
Diff line number
Diff line








@@ -198,8 +198,9 @@ void BakedOpRenderer::drawRects(const float* rects, int count, const SkPaint* pa





























    LOG_ALWAYS_FATAL_IF(mRenderTarget.frameBufferId != 0, "decoration only supported for FBO 0");















    // TODO: Currently assume full FBO damage, due to FrameInfoVisualizer::unionDirty.













    // Should should scissor safely.













    // Should should scissor/set mHasDrawn safely.















    mRenderState.scissor().setEnabled(false);













    mHasDrawn = true;















    Glop glop;















    GlopBuilder(mRenderState, mCaches, &glop)















            .setRoundRectClipState(nullptr)