summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Matt Casey <mrcasey@google.com> 2024-04-04 14:15:42 +0000
committer Matt Casey <mrcasey@google.com> 2024-04-04 15:05:06 +0000
commitcdb2ffba6065fa28cb21c80d61b09bf8d20e15ba (patch)
tree8731392194934b42dbdb0bf24e34858850bbd271
parent8756fdba5f0dfe062c51450366ad50a6cbe048f0 (diff)
Provide AssistContent to ScreenshotActionsProvider.
Bug: 329659738 Test: Validating flow via logging Flag: ACONFIG com.android.systemui.screenshot_shelf_ui DEVELOPMENT Change-Id: Ic8e92028b49c31f318594e1d5bffbabc6ec7eb9f
-rw-r--r--packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotActionsProvider.kt3
-rw-r--r--packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java7
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);