Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 147b446f authored by Matt Casey's avatar Matt Casey Committed by Android (Google) Code Review
Browse files

Merge "Provide AssistContent to ScreenshotActionsProvider." into main

parents 8154bddc cdb2ffba

packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotActionsProvider.kt

+3 −0
Original line number Diff line number Diff line
@@ -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,

packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java

+7 −0
Original line number Diff line number Diff line
@@ -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);