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

Commit 94f38a84 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Make sure view is laid out before calling createBitmap" am: 13b8faaa... 

Merge "Make sure view is laid out before calling createBitmap" am: 13b8faaa am: d33d089b am: d6fe5c10

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2216261



Change-Id: Id52db20ac11afa3239ed681b5e8eb3d038a3e196
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b6b725e4 d6fe5c10

packages/SettingsLib/src/com/android/settingslib/qrcode/QrDecorateView.java

+25 −20
Original line number Diff line number Diff line
@@ -34,16 +34,16 @@ public class QrDecorateView extends View { 
    private static final float CORNER_LINE_LENGTH = 264f;   // 264dp

    private static final float CORNER_RADIUS = 16f;         // 16dp



    final private int mCornerColor;

    final private int mFocusedCornerColor;

    final private int mBackgroundColor;

    private final int mCornerColor;

    private final int mFocusedCornerColor;

    private final int mBackgroundColor;



    final private Paint mStrokePaint;

    final private Paint mTransparentPaint;

    final private Paint mBackgroundPaint;

    private final Paint mStrokePaint;

    private final Paint mTransparentPaint;

    private final Paint mBackgroundPaint;



    final private float mRadius;

    final private float mInnerRidus;

    private final float mRadius;

    private final float mInnerRadius;



    private Bitmap mMaskBitmap;

    private Canvas mMaskCanvas;
@@ -72,7 +72,7 @@ public class QrDecorateView extends View { 
        mRadius = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, CORNER_RADIUS,

                getResources().getDisplayMetrics());

        // Inner radius needs to minus stroke width for keeping the width of border consistent.

        mInnerRidus = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP,

        mInnerRadius = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP,

                CORNER_RADIUS - CORNER_STROKE_WIDTH, getResources().getDisplayMetrics());



        mCornerColor = context.getResources().getColor(R.color.qr_corner_line_color);
@@ -95,6 +95,9 @@ public class QrDecorateView extends View { 
    protected void onLayout(boolean changed, int left, int top, int right, int bottom) {

        super.onLayout(changed, left, top, right, bottom);



        if (!isLaidOut()) {

            return;

        }

        if (mMaskBitmap == null) {

            mMaskBitmap = Bitmap.createBitmap(getWidth(), getHeight(), Bitmap.Config.ARGB_8888);

            mMaskCanvas = new Canvas(mMaskBitmap);
@@ -105,6 +108,7 @@ public class QrDecorateView extends View { 


    @Override

    protected void onDraw(Canvas canvas) {

        if (mMaskCanvas != null && mMaskBitmap != null) {

            // Set frame line color.

            mStrokePaint.setColor(mFocused ? mFocusedCornerColor : mCornerColor);

            // Draw background color.
@@ -112,9 +116,10 @@ public class QrDecorateView extends View { 
            // Draw outer corner.

            mMaskCanvas.drawRoundRect(mOuterFrame, mRadius, mRadius, mStrokePaint);

            // Draw inner transparent corner.

        mMaskCanvas.drawRoundRect(mInnerFrame, mInnerRidus, mInnerRidus, mTransparentPaint);

            mMaskCanvas.drawRoundRect(mInnerFrame, mInnerRadius, mInnerRadius, mTransparentPaint);



            canvas.drawBitmap(mMaskBitmap, 0, 0, mBackgroundPaint);

        }

        super.onDraw(canvas);

    }