diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotActionsProvider.kt | 3 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java | 7 |
2 files changed, 10 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotActionsProvider.kt b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotActionsProvider.kt index ca0a539d5ee0..19c0b16d8986 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotActionsProvider.kt +++ b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotActionsProvider.kt @@ -20,6 +20,7 @@ import android.app.ActivityOptions import android.app.BroadcastOptions import android.app.ExitTransitionCoordinator import android.app.PendingIntent +import android.app.assist.AssistContent import android.content.Context import android.content.Intent import android.os.Process @@ -58,6 +59,8 @@ interface ScreenshotActionsProvider { fun setCompletedScreenshot(result: SavedImageData) fun isPendingSharedTransition(): Boolean + fun onAssistContentAvailable(assistContent: AssistContent) {} + interface Factory { fun create( request: ScreenshotData, diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java index 70d1129a2b40..1e513b200ac4 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java +++ b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java @@ -453,6 +453,13 @@ public class ScreenshotController { return Unit.INSTANCE; }); saveScreenshotInBackground(screenshot, requestId, finisher); + + if (screenshot.getTaskId() >= 0) { + mAssistContentRequester.requestAssistContent(screenshot.getTaskId(), + assistContent -> { + mActionsProvider.onAssistContentAvailable(assistContent); + }); + } } else { saveScreenshotInWorkerThread(screenshot.getUserHandle(), finisher, this::showUiOnActionsReady, this::showUiOnQuickShareActionReady); |