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

Commit f13c08bc authored by Matt Casey's avatar Matt Casey
Browse files

Provide AssistContent to ScreenshotActionsProvider. 

Bug: 329659738
Test: Validating flow via logging
Flag: ACONFIG com.android.systemui.screenshot_shelf_ui DEVELOPMENT
Change-Id: Ic8e92028b49c31f318594e1d5bffbabc6ec7eb9f
Merged-In: Ic8e92028b49c31f318594e1d5bffbabc6ec7eb9f
parent cff501c8

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

+3 −0
Original line number Original line Diff line number Diff line
@@ -20,6 +20,7 @@ import android.app.ActivityOptions 
import android.app.BroadcastOptions

import android.app.BroadcastOptions

import android.app.ExitTransitionCoordinator

import android.app.ExitTransitionCoordinator

import android.app.PendingIntent

import android.app.PendingIntent

import android.app.assist.AssistContent

import android.content.Context

import android.content.Context

import android.content.Intent

import android.content.Intent

import android.os.Process

import android.os.Process
@@ -58,6 +59,8 @@ interface ScreenshotActionsProvider { 
    fun setCompletedScreenshot(result: SavedImageData)

    fun setCompletedScreenshot(result: SavedImageData)

    fun isPendingSharedTransition(): Boolean

    fun isPendingSharedTransition(): Boolean





    fun onAssistContentAvailable(assistContent: AssistContent) {}



    interface Factory {

    interface Factory {

        fun create(

        fun create(

            request: ScreenshotData,

            request: ScreenshotData,

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

+7 −0
Original line number Original line Diff line number Diff line
@@ -453,6 +453,13 @@ public class ScreenshotController { 
                        return Unit.INSTANCE;

                        return Unit.INSTANCE;

                    });

                    });

            saveScreenshotInBackground(screenshot, requestId, finisher);

            saveScreenshotInBackground(screenshot, requestId, finisher);



            if (screenshot.getTaskId() >= 0) {

                mAssistContentRequester.requestAssistContent(screenshot.getTaskId(),

                        assistContent -> {

                            mActionsProvider.onAssistContentAvailable(assistContent);

                        });

            }

        } else {

        } else {

            saveScreenshotInWorkerThread(screenshot.getUserHandle(), finisher,

            saveScreenshotInWorkerThread(screenshot.getUserHandle(), finisher,

                    this::showUiOnActionsReady, this::showUiOnQuickShareActionReady);

                    this::showUiOnActionsReady, this::showUiOnQuickShareActionReady);