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

Commit a3acf73c authored by Doris Liu's avatar Doris Liu Committed by Android (Google) Code Review
Browse files

Merge "Associate RenderNodes created for hw bitmap w/ views" into oc-mr1-dev

parents 88c6071b d4c5ab8b

core/java/android/app/SharedElementCallback.java

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ public abstract class SharedElementCallback { 
            Drawable d = imageView.getDrawable();

            Drawable bg = imageView.getBackground();

            if (d != null && (bg == null || bg.getAlpha() == 0)) {

                Bitmap bitmap = TransitionUtils.createDrawableBitmap(d);

                Bitmap bitmap = TransitionUtils.createDrawableBitmap(d, imageView);

                if (bitmap != null) {

                    Bundle bundle = new Bundle();

                    if (bitmap.getConfig() != Bitmap.Config.HARDWARE) {

core/java/android/transition/TransitionUtils.java

+3 −3
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ public class TransitionUtils { 
    /**

     * Get a copy of bitmap of given drawable, return null if intrinsic size is zero

     */

    public static Bitmap createDrawableBitmap(Drawable drawable) {

    public static Bitmap createDrawableBitmap(Drawable drawable, View hostView) {

        int width = drawable.getIntrinsicWidth();

        int height = drawable.getIntrinsicHeight();

        if (width <= 0 || height <= 0) {
@@ -128,7 +128,7 @@ public class TransitionUtils { 
        }

        int bitmapWidth = (int) (width * scale);

        int bitmapHeight = (int) (height * scale);

        final RenderNode node = RenderNode.create("TransitionUtils", null);

        final RenderNode node = RenderNode.create("TransitionUtils", hostView);

        node.setLeftTopRightBottom(0, 0, width, height);

        node.setClipToBounds(false);

        final DisplayListCanvas canvas = node.start(width, height);
@@ -172,7 +172,7 @@ public class TransitionUtils { 
            matrix.postTranslate(-bounds.left, -bounds.top);

            matrix.postScale(scale, scale);



            final RenderNode node = RenderNode.create("TransitionUtils", null);

            final RenderNode node = RenderNode.create("TransitionUtils", view);

            node.setLeftTopRightBottom(0, 0, bitmapWidth, bitmapHeight);

            node.setClipToBounds(false);

            final DisplayListCanvas canvas = node.start(bitmapWidth, bitmapHeight);