Merge "Load clipboard image thumbnail in background" into tm-qpr-dev (a4d84996) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardOverlayController.java

+16 −11

Original line number	Diff line number	Diff line
		@@ -263,10 +263,11 @@ public class ClipboardOverlayController implements ClipboardListener.ClipboardOv
		@Override // ClipboardListener.ClipboardOverlay
		public void setClipData(ClipData data, String source) {
		ClipboardModel model = ClipboardModel.fromClipData(mContext, mClipboardUtils, data, source);
		if (mExitAnimator != null && mExitAnimator.isRunning()) {
		boolean wasExiting = (mExitAnimator != null && mExitAnimator.isRunning());
		if (wasExiting) {
		mExitAnimator.cancel();
		}
		boolean shouldAnimate = !model.dataMatches(mClipboardModel);
		boolean shouldAnimate = !model.dataMatches(mClipboardModel) \|\| wasExiting;
		mClipboardModel = model;
		mClipboardLogger.setClipSource(mClipboardModel.getSource());
		if (shouldAnimate) {
		@@ -313,15 +314,19 @@ public class ClipboardOverlayController implements ClipboardListener.ClipboardOv
		mOnPreviewTapped = this::editText;
		break;
		case IMAGE:
		mBgExecutor.execute(() -> {
		if (model.isSensitive() \|\| model.loadThumbnail(mContext) != null) {
		mView.post(() -> {
		mView.showImagePreview(
		model.isSensitive() ? null : model.loadThumbnail(mContext));
		mView.setEditAccessibilityAction(true);
		});
		mOnPreviewTapped = () -> editImage(model.getUri());
		} else {
		// image loading failed
		mView.showDefaultTextPreview();
		mView.post(mView::showDefaultTextPreview);
		}
		});
		break;
		case URI:
		case OTHER: