From 1381c1c1326e77ef6024ad2b648227f197ac9e63 Mon Sep 17 00:00:00 2001 From: Mark Renouf Date: Fri, 29 Jan 2021 10:29:18 -0500 Subject: [PATCH] Fix missing preview image A bug is preventing the preview drawable from appearing when added empty. As a temporary workaround, add it to the UI once a predetermined area is captured. Bug: 178797544 Test: manual Change-Id: I36672f1be495d8996223a19a00223bbe7e777d06 --- .../systemui/screenshot/ScrollCaptureController.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ScrollCaptureController.java b/packages/SystemUI/src/com/android/systemui/screenshot/ScrollCaptureController.java index c2c67903da864..9be3566e1f637 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/ScrollCaptureController.java +++ b/packages/SystemUI/src/com/android/systemui/screenshot/ScrollCaptureController.java @@ -23,7 +23,6 @@ import android.content.Intent; import android.net.Uri; import android.os.UserHandle; import android.util.Log; -import android.view.LayoutInflater; import android.view.View; import android.view.ViewTreeObserver.InternalInsetsInfo; import android.view.ViewTreeObserver.OnComputeInternalInsetsListener; @@ -59,7 +58,6 @@ public class ScrollCaptureController implements OnComputeInternalInsetsListener private final Executor mBgExecutor; private final ImageExporter mImageExporter; private final ImageTileSet mImageTileSet; - private final LayoutInflater mLayoutInflater; private ZonedDateTime mCaptureTime; private UUID mRequestId; @@ -81,7 +79,6 @@ public class ScrollCaptureController implements OnComputeInternalInsetsListener mBgExecutor = bgExecutor; mImageExporter = exporter; mImageTileSet = new ImageTileSet(); - mLayoutInflater = mContext.getSystemService(LayoutInflater.class); } /** @@ -114,7 +111,7 @@ public class ScrollCaptureController implements OnComputeInternalInsetsListener mEdit.setOnClickListener(this::onClicked); mShare.setOnClickListener(this::onClicked); - mPreview.setImageDrawable(mImageTileSet.getDrawable()); + //mPreview.setImageDrawable(mImageTileSet.getDrawable()); mConnection.start(this::startCapture); } @@ -242,6 +239,7 @@ public class ScrollCaptureController implements OnComputeInternalInsetsListener if (mImageTileSet.isEmpty()) { session.end(mCallback::onFinish); } else { + mPreview.setImageDrawable(mImageTileSet.getDrawable()); mExportFuture = mImageExporter.export( mBgExecutor, mRequestId, mImageTileSet.toBitmap(), mCaptureTime); // The user chose an action already, link it to the result