Commit 13b7185b authored by Clemens Arbesser's avatar Clemens Arbesser Committed by Commit Bot

Fix overlay image disappearing during flow.

Prior to this CL, the overlay image would disappear during the flow because the check to disambiguate between full and partial overlays was wrong.

Bug: 806868
Change-Id: Ice8e1bf16a4c077edea81f13fb97e286ef4a58a3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1948434
Auto-Submit: Clemens Arbesser <arbesser@google.com>
Reviewed-by: default avatarMathias Carlen <mcarlen@chromium.org>
Commit-Queue: Mathias Carlen <mcarlen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#720933}
parent c60fd59c
...@@ -305,8 +305,8 @@ class AssistantOverlayDrawable extends Drawable implements FullscreenListener { ...@@ -305,8 +305,8 @@ class AssistantOverlayDrawable extends Drawable implements FullscreenListener {
canvas.drawPaint(mBackground); canvas.drawPaint(mBackground);
// Draw overlay image, if specified. // Draw overlay image, if specified.
if (mTransparentArea.isEmpty() && mOverlayImage != null if (!mPartial && mOverlayImage != null && mOverlayImage.mImageBitmap != null
&& mOverlayImage.mImageBitmap != null && mOverlayImage.mImageSize != null) { && mOverlayImage.mImageSize != null) {
DisplayMetrics displayMetrics = mContext.getResources().getDisplayMetrics(); DisplayMetrics displayMetrics = mContext.getResources().getDisplayMetrics();
int imageSize = mOverlayImage.mImageSize.getSizeInPixels(displayMetrics); int imageSize = mOverlayImage.mImageSize.getSizeInPixels(displayMetrics);
int topMargin = 0; int topMargin = 0;
......
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