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

Commit f454ded3 authored by Derek Sollenberger's avatar Derek Sollenberger Committed by Android (Google) Code Review
Browse files

Merge "Stop using deprecated Canvas APIs." into ub-launcher3-master

parents c466b173 26a1b452

src/com/android/launcher3/badge/BadgeRenderer.java

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ public class BadgeRenderer { 
            Log.e(TAG, "Invalid null argument(s) passed in call to draw.");

            return;

        }

        canvas.save(Canvas.MATRIX_SAVE_FLAG);

        canvas.save();

        // We draw the badge relative to its center.

        float badgeCenterX = iconBounds.right - mDotCenterOffset / 2;

        float badgeCenterY = iconBounds.top + mDotCenterOffset / 2;

src/com/android/launcher3/dragndrop/DragView.java

+1 −1
Original line number Diff line number Diff line
@@ -448,7 +448,7 @@ public class DragView extends View { 
            canvas.drawBitmap(mBitmap, 0.0f, 0.0f, mPaint);

            if (crossFade) {

                mPaint.setAlpha((int) (255 * mCrossFadeProgress));

                final int saveCount = canvas.save(Canvas.MATRIX_SAVE_FLAG);

                final int saveCount = canvas.save();

                float sX = (mBitmap.getWidth() * 1.0f) / mCrossFadeBitmap.getWidth();

                float sY = (mBitmap.getHeight() * 1.0f) / mCrossFadeBitmap.getHeight();

                canvas.scale(sX, sY);

src/com/android/launcher3/folder/FolderIcon.java

+3 −4
Original line number Diff line number Diff line
@@ -467,11 +467,10 @@ public class FolderIcon extends FrameLayout implements FolderListener { 
        final int saveCount;



        if (canvas.isHardwareAccelerated()) {

            saveCount = canvas.saveLayer(0, 0, getWidth(), getHeight(), null,

                    Canvas.HAS_ALPHA_LAYER_SAVE_FLAG | Canvas.CLIP_TO_LAYER_SAVE_FLAG);

            saveCount = canvas.saveLayer(0, 0, getWidth(), getHeight(), null);

        } else {

            saveCount = canvas.save(Canvas.CLIP_SAVE_FLAG);

            canvas.clipPath(mBackground.getClipPath(), Region.Op.INTERSECT);

            saveCount = canvas.save();

            canvas.clipPath(mBackground.getClipPath());

        }



        mPreviewItemManager.draw(canvas);

src/com/android/launcher3/folder/PreviewBackground.java

+2 −3
Original line number Diff line number Diff line
@@ -227,11 +227,10 @@ public class PreviewBackground { 
        final int saveCount;

        if (canvas.isHardwareAccelerated()) {

            saveCount = canvas.saveLayer(offsetX - mStrokeWidth, offsetY,

                    offsetX + radius + shadowRadius, offsetY + shadowRadius + shadowRadius,

                    null, Canvas.CLIP_TO_LAYER_SAVE_FLAG | Canvas.HAS_ALPHA_LAYER_SAVE_FLAG);

                    offsetX + radius + shadowRadius, offsetY + shadowRadius + shadowRadius, null);



        } else {

            saveCount = canvas.save(Canvas.CLIP_SAVE_FLAG);

            saveCount = canvas.save();

            canvas.clipPath(getClipPath(), Region.Op.DIFFERENCE);

        }

src/com/android/launcher3/folder/PreviewItemManager.java

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ public class PreviewItemManager { 
    }



    private void drawPreviewItem(Canvas canvas, PreviewItemDrawingParams params) {

        canvas.save(Canvas.MATRIX_SAVE_FLAG);

        canvas.save();

        canvas.translate(params.transX, params.transY);

        canvas.scale(params.scale, params.scale);

        Drawable d = params.drawable;