Commit 44839655 authored by Gayane Petrosyan's avatar Gayane Petrosyan Committed by Commit Bot

[QRCode Android] Scale QRcode bitmap for downloads

Bug: 1085873
Change-Id: I2ec9e4e673757c31ea354bb542430512199771a6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2213882Reviewed-by: default avatarTravis Skare <skare@chromium.org>
Commit-Queue: Gayane Petrosyan <gayane@chromium.org>
Cr-Commit-Position: refs/heads/master@{#771375}
parent 0c45ae8e
...@@ -14,4 +14,5 @@ ...@@ -14,4 +14,5 @@
<dimen name="url_box_top_padding">128dp</dimen> <dimen name="url_box_top_padding">128dp</dimen>
<dimen name="url_box_left_padding">40dp</dimen> <dimen name="url_box_left_padding">40dp</dimen>
<dimen name="url_box_bottom_padding">32dp</dimen> <dimen name="url_box_bottom_padding">32dp</dimen>
<dimen name="qrcode_size">212dp</dimen>
</resources> </resources>
...@@ -135,8 +135,8 @@ class QrCodeShareMediator implements ShareImageFileUtils.OnImageSaveListener { ...@@ -135,8 +135,8 @@ class QrCodeShareMediator implements ShareImageFileUtils.OnImageSaveListener {
private Bitmap addUrlToBitmap(Bitmap bitmap, String url) { private Bitmap addUrlToBitmap(Bitmap bitmap, String url) {
// Assumes QR code bitmap is a square. // Assumes QR code bitmap is a square.
int qrCodeSize = bitmap.getWidth(); int qrCodeSize = mContext.getResources().getDimensionPixelSize(
org.chromium.chrome.browser.share.R.dimen.qrcode_size);
int fontSize = mContext.getResources().getDimensionPixelSize(R.dimen.text_size_large); int fontSize = mContext.getResources().getDimensionPixelSize(R.dimen.text_size_large);
int textLeftPadding = mContext.getResources().getDimensionPixelSize( int textLeftPadding = mContext.getResources().getDimensionPixelSize(
org.chromium.chrome.browser.share.R.dimen.url_box_left_padding); org.chromium.chrome.browser.share.R.dimen.url_box_left_padding);
...@@ -164,7 +164,8 @@ class QrCodeShareMediator implements ShareImageFileUtils.OnImageSaveListener { ...@@ -164,7 +164,8 @@ class QrCodeShareMediator implements ShareImageFileUtils.OnImageSaveListener {
canvas.drawColor(android.graphics.Color.WHITE); canvas.drawColor(android.graphics.Color.WHITE);
canvas.translate(textLeftPadding, textTopPadding); canvas.translate(textLeftPadding, textTopPadding);
mTextLayout.draw(canvas); mTextLayout.draw(canvas);
canvas.drawBitmap(bitmap, (int) ((width - qrCodeSize) / 2) - textLeftPadding, canvas.drawBitmap(Bitmap.createScaledBitmap(bitmap, qrCodeSize, qrCodeSize, false),
(int) ((width - qrCodeSize) / 2) - textLeftPadding,
mTextLayout.getHeight() + textBottomPadding, mTextPaint); mTextLayout.getHeight() + textBottomPadding, mTextPaint);
return newBitmap; return newBitmap;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment