re-add qr-code overlay logo

This commit is contained in:
B. Petersen
2019-02-02 17:18:30 +01:00
parent 44075917b7
commit 2be7b9bb15
@@ -137,11 +137,8 @@ public class QrShowActivity extends AppCompatActivity implements DcEventCenter.D
Bitmap bitmap = Bitmap.createBitmap(w, h, Bitmap.Config.ARGB_8888);
bitmap.setPixels(pixels, 0, w, 0, 0, w, h);
int configQrOverlayLogo = DcHelper.getInt(this, DcHelper.CONFIG_QR_OVERLAY_LOGO, 1);
if (configQrOverlayLogo != 0) {
Bitmap overlay = BitmapFactory.decodeResource(this.getResources(), R.drawable.qr_overlay);
putOverlay(bitmap, overlay);
}
Bitmap overlay = BitmapFactory.decodeResource(this.getResources(), R.drawable.qr_overlay);
putOverlay(bitmap, overlay);
return bitmap;
}