Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix missing preview image" into sc-dev

Browse Source
This commit is contained in:
Mark Renouf
2021-01-29 17:58:53 +00:00
committed by Android (Google) Code Review
parent ec5e4e5727 1381c1c132
commit 2a67d9d5a1
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/screenshot/ScrollCaptureController.java
View File

@@ -23,7 +23,6 @@ import android.content.Intent;
import android.net.Uri; import android.net.Uri;
import android.os.UserHandle; import android.os.UserHandle;
import android.util.Log; import android.util.Log;
import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewTreeObserver.InternalInsetsInfo; import android.view.ViewTreeObserver.InternalInsetsInfo;
import android.view.ViewTreeObserver.OnComputeInternalInsetsListener; import android.view.ViewTreeObserver.OnComputeInternalInsetsListener;
@@ -59,7 +58,6 @@ public class ScrollCaptureController implements OnComputeInternalInsetsListener
private final Executor mBgExecutor; private final Executor mBgExecutor;
private final ImageExporter mImageExporter; private final ImageExporter mImageExporter;
private final ImageTileSet mImageTileSet; private final ImageTileSet mImageTileSet;
private final LayoutInflater mLayoutInflater;
private ZonedDateTime mCaptureTime; private ZonedDateTime mCaptureTime;
private UUID mRequestId; private UUID mRequestId;
@@ -81,7 +79,6 @@ public class ScrollCaptureController implements OnComputeInternalInsetsListener
mBgExecutor = bgExecutor; mBgExecutor = bgExecutor;
mImageExporter = exporter; mImageExporter = exporter;
mImageTileSet = new ImageTileSet(); mImageTileSet = new ImageTileSet();
mLayoutInflater = mContext.getSystemService(LayoutInflater.class);
} }
/** /**
@@ -114,7 +111,7 @@ public class ScrollCaptureController implements OnComputeInternalInsetsListener
mEdit.setOnClickListener(this::onClicked); mEdit.setOnClickListener(this::onClicked);
mShare.setOnClickListener(this::onClicked); mShare.setOnClickListener(this::onClicked);
mPreview.setImageDrawable(mImageTileSet.getDrawable()); //mPreview.setImageDrawable(mImageTileSet.getDrawable());
mConnection.start(this::startCapture); mConnection.start(this::startCapture);
} }
@@ -242,6 +239,7 @@ public class ScrollCaptureController implements OnComputeInternalInsetsListener
if (mImageTileSet.isEmpty()) { if (mImageTileSet.isEmpty()) {
session.end(mCallback::onFinish); session.end(mCallback::onFinish);
} else { } else {
mPreview.setImageDrawable(mImageTileSet.getDrawable());
mExportFuture = mImageExporter.export( mExportFuture = mImageExporter.export(
mBgExecutor, mRequestId, mImageTileSet.toBitmap(), mCaptureTime); mBgExecutor, mRequestId, mImageTileSet.toBitmap(), mCaptureTime);
// The user chose an action already, link it to the result // The user chose an action already, link it to the result