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

Commit 8a3323ad authored by Alan Viverette's avatar Alan Viverette Committed by android-build-merger
Browse files

am bde76419: am 1f3f47b3: Merge "Avoid double-translating View background" into lmp-mr1-dev 

automerge: 4d41e49f

* commit '4d41e49f':
  Avoid double-translating View background
parents 58958678 4d41e49f

core/java/android/view/View.java

+7 −0
Original line number Original line Diff line number Diff line
@@ -15531,6 +15531,13 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
        final int width = bounds.width();

        final int width = bounds.width();

        final int height = bounds.height();

        final int height = bounds.height();

        final HardwareCanvas canvas = renderNode.start(width, height);

        final HardwareCanvas canvas = renderNode.start(width, height);














        // Reverse left/top translation done by drawable canvas, which will














        // instead be applied by rendernode's LTRB bounds below. This way, the














        // drawable's bounds match with its rendernode bounds and its content














        // will lie within those bounds in the rendernode tree.














        canvas.translate(-bounds.left, -bounds.top);
























        try {







        try {











            drawable.draw(canvas);







            drawable.draw(canvas);











        } finally {







        } finally {