Merge changes I09a62c7b,I561ec589,I7f5a9fa9 into main (ac45efa0) · Commits · e / os / android_frameworks_base

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

0 → 100644

+113 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2024 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.systemui.screenshot

		import android.app.ActivityOptions
		import android.app.BroadcastOptions
		import android.app.ExitTransitionCoordinator
		import android.app.ExitTransitionCoordinator.ExitTransitionCallbacks
		import android.app.PendingIntent
		import android.content.Intent
		import android.os.UserHandle
		import android.util.Log
		import android.util.Pair
		import android.view.View
		import android.view.Window
		import com.android.app.tracing.coroutines.launch
		import com.android.internal.app.ChooserActivity
		import com.android.systemui.dagger.qualifiers.Application
		import dagger.assisted.Assisted
		import dagger.assisted.AssistedFactory
		import dagger.assisted.AssistedInject
		import kotlinx.coroutines.CoroutineScope

		class ActionExecutor
		@AssistedInject
		constructor(
		private val intentExecutor: ActionIntentExecutor,
		@Application private val applicationScope: CoroutineScope,
		@Assisted val window: Window,
		@Assisted val transitionView: View,
		@Assisted val onDismiss: (() -> Unit)
		) {

		var isPendingSharedTransition = false
		private set

		fun startSharedTransition(intent: Intent, user: UserHandle, overrideTransition: Boolean) {
		isPendingSharedTransition = true
		val windowTransition = createWindowTransition()
		applicationScope.launch("$TAG#launchIntentAsync") {
		intentExecutor.launchIntent(
		intent,
		user,
		overrideTransition,
		windowTransition.first,
		windowTransition.second
		)
		}
		}

		fun sendPendingIntent(pendingIntent: PendingIntent) {
		try {
		val options = BroadcastOptions.makeBasic()
		options.setInteractive(true)
		options.setPendingIntentBackgroundActivityStartMode(
		ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED
		)
		pendingIntent.send(options.toBundle())
		onDismiss.invoke()
		} catch (e: PendingIntent.CanceledException) {
		Log.e(TAG, "Intent cancelled", e)
		}
		}

		/**
		* Supplies the necessary bits for the shared element transition to share sheet. Note that once
		* called, the action intent to share must be sent immediately after.
		*/
		private fun createWindowTransition(): Pair<ActivityOptions, ExitTransitionCoordinator> {
		val callbacks: ExitTransitionCallbacks =
		object : ExitTransitionCallbacks {
		override fun isReturnTransitionAllowed(): Boolean {
		return false
		}

		override fun hideSharedElements() {
		isPendingSharedTransition = false
		onDismiss.invoke()
		}

		override fun onFinish() {}
		}
		return ActivityOptions.startSharedElementAnimation(
		window,
		callbacks,
		null,
		Pair.create(transitionView, ChooserActivity.FIRST_IMAGE_PREVIEW_TRANSITION_NAME)
		)
		}

		@AssistedFactory
		interface Factory {
		fun create(window: Window, transitionView: View, onDismiss: (() -> Unit)): ActionExecutor
		}

		companion object {
		private const val TAG = "ActionExecutor"
		}
		}

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

+10 −0

Original line number	Diff line number	Diff line
		@@ -23,7 +23,9 @@ import android.content.ContentProvider
		import android.content.Context
		import android.content.Intent
		import android.net.Uri
		import android.os.UserHandle
		import com.android.systemui.res.R
		import com.android.systemui.screenshot.scroll.LongScreenshotActivity

		object ActionIntentCreator {
		/** @return a chooser intent to share the given URI. */
		@@ -89,6 +91,14 @@ object ActionIntentCreator {
		.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK)
		}

		/** @return an Intent to start the LongScreenshotActivity */
		fun createLongScreenshotIntent(owner: UserHandle, context: Context): Intent {
		return Intent(context, LongScreenshotActivity::class.java)
		.putExtra(LongScreenshotActivity.EXTRA_SCREENSHOT_USER_HANDLE, owner)
		.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
		.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
		}

		private const val EXTRA_EDIT_SOURCE = "edit_source"
		private const val EDIT_SOURCE_SCREENSHOT = "screenshot"
		}

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

+8 −9

Original line number	Diff line number	Diff line
		@@ -25,7 +25,6 @@ import android.os.Process.myUserHandle
		import android.os.RemoteException
		import android.os.UserHandle
		import android.util.Log
		import android.util.Pair
		import android.view.IRemoteAnimationFinishedCallback
		import android.view.IRemoteAnimationRunner
		import android.view.RemoteAnimationAdapter
		@@ -67,20 +66,22 @@ constructor(
		*/
		fun launchIntentAsync(
		intent: Intent,
		transition: Pair<ActivityOptions, ExitTransitionCoordinator>?,
		user: UserHandle,
		overrideTransition: Boolean,
		options: ActivityOptions?,
		transitionCoordinator: ExitTransitionCoordinator?,
		) {
		applicationScope.launch("$TAG#launchIntentAsync") {
		launchIntent(intent, transition, user, overrideTransition)
		launchIntent(intent, user, overrideTransition, options, transitionCoordinator)
		}
		}

		suspend fun launchIntent(
		intent: Intent,
		transition: Pair<ActivityOptions, ExitTransitionCoordinator>?,
		user: UserHandle,
		overrideTransition: Boolean,
		options: ActivityOptions?,
		transitionCoordinator: ExitTransitionCoordinator?,
		) {
		if (screenshotActionDismissSystemWindows()) {
		keyguardController.dismiss()
		@@ -90,14 +91,12 @@ constructor(
		} else {
		dismissKeyguard()
		}
		transition?.second?.startExit()
		transitionCoordinator?.startExit()

		if (user == myUserHandle()) {
		withContext(mainDispatcher) {
		context.startActivity(intent, transition?.first?.toBundle())
		}
		withContext(mainDispatcher) { context.startActivity(intent, options?.toBundle()) }
		} else {
		launchCrossProfileIntent(user, intent, transition?.first?.toBundle())
		launchCrossProfileIntent(user, intent, options?.toBundle())
		}

		if (overrideTransition) {

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

+36 −58

Original line number	Diff line number	Diff line
		@@ -16,20 +16,11 @@

		package com.android.systemui.screenshot

		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.UserHandle
		import android.util.Log
		import android.util.Pair
		import androidx.appcompat.content.res.AppCompatResources
		import com.android.app.tracing.coroutines.launch
		import com.android.internal.logging.UiEventLogger
		import com.android.systemui.dagger.qualifiers.Application
		import com.android.systemui.log.DebugLogger.debugLog
		import com.android.systemui.res.R
		import com.android.systemui.screenshot.ActionIntentCreator.createEdit
		@@ -43,15 +34,14 @@ import com.android.systemui.screenshot.ui.viewmodel.ScreenshotViewModel
		import dagger.assisted.Assisted
		import dagger.assisted.AssistedFactory
		import dagger.assisted.AssistedInject
		import kotlinx.coroutines.CoroutineScope

		/**
		* Provides actions for screenshots. This class can be overridden by a vendor-specific SysUI
		* implementation.
		*/
		interface ScreenshotActionsProvider {
		fun onScrollChipReady(onClick: Runnable)
		fun setCompletedScreenshot(result: ScreenshotSavedResult)
		fun isPendingSharedTransition(): Boolean

		fun onAssistContentAvailable(assistContent: AssistContent) {}

		@@ -59,8 +49,7 @@ interface ScreenshotActionsProvider {
		fun create(
		request: ScreenshotData,
		requestId: String,
		windowTransition: () -> Pair<ActivityOptions, ExitTransitionCoordinator>,
		requestDismissal: () -> Unit,
		actionExecutor: ActionExecutor,
		): ScreenshotActionsProvider
		}
		}
		@@ -70,25 +59,25 @@ class DefaultScreenshotActionsProvider
		constructor(
		private val context: Context,
		private val viewModel: ScreenshotViewModel,
		private val actionExecutor: ActionIntentExecutor,
		private val smartActionsProvider: SmartActionsProvider,
		private val uiEventLogger: UiEventLogger,
		@Application private val applicationScope: CoroutineScope,
		@Assisted val request: ScreenshotData,
		@Assisted val requestId: String,
		@Assisted val windowTransition: () -> Pair<ActivityOptions, ExitTransitionCoordinator>,
		@Assisted val requestDismissal: () -> Unit,
		@Assisted val actionExecutor: ActionExecutor,
		) : ScreenshotActionsProvider {
		private var pendingAction: ((ScreenshotSavedResult) -> Unit)? = null
		private var result: ScreenshotSavedResult? = null
		private var isPendingSharedTransition = false

		init {
		viewModel.setPreviewAction {
		debugLog(LogConfig.DEBUG_ACTIONS) { "Preview tapped" }
		uiEventLogger.log(SCREENSHOT_PREVIEW_TAPPED, 0, request.packageNameString)
		onDeferrableActionTapped { result ->
		startSharedTransition(createEdit(result.uri, context), result.user, true)
		actionExecutor.startSharedTransition(
		createEdit(result.uri, context),
		result.user,
		true
		)
		}
		}
		viewModel.addAction(
		@@ -100,7 +89,11 @@ constructor(
		debugLog(LogConfig.DEBUG_ACTIONS) { "Edit tapped" }
		uiEventLogger.log(SCREENSHOT_EDIT_TAPPED, 0, request.packageNameString)
		onDeferrableActionTapped { result ->
		startSharedTransition(createEdit(result.uri, context), result.user, true)
		actionExecutor.startSharedTransition(
		createEdit(result.uri, context),
		result.user,
		true
		)
		}
		}
		)
		@@ -113,7 +106,7 @@ constructor(
		debugLog(LogConfig.DEBUG_ACTIONS) { "Share tapped" }
		uiEventLogger.log(SCREENSHOT_SHARE_TAPPED, 0, request.packageNameString)
		onDeferrableActionTapped { result ->
		startSharedTransition(
		actionExecutor.startSharedTransition(
		createShareWithSubject(result.uri, result.subject),
		result.user,
		false
		@@ -136,11 +129,14 @@ constructor(
		0,
		request.packageNameString
		)
		sendPendingIntent(
		smartActionsProvider
		.wrapIntent(quickShare, result.uri, result.subject, requestId)
		.actionIntent
		val pendingIntentWithUri =
		smartActionsProvider.wrapIntent(
		quickShare,
		result.uri,
		result.subject,
		requestId
		)
		actionExecutor.sendPendingIntent(pendingIntentWithUri)
		}
		}
		)
		@@ -150,6 +146,18 @@ constructor(
		}
		}

		override fun onScrollChipReady(onClick: Runnable) {
		viewModel.addAction(
		ActionButtonViewModel(
		AppCompatResources.getDrawable(context, R.drawable.ic_screenshot_scroll),
		context.resources.getString(R.string.screenshot_scroll_label),
		context.resources.getString(R.string.screenshot_scroll_label),
		) {
		onClick.run()
		}
		)
		}

		override fun setCompletedScreenshot(result: ScreenshotSavedResult) {
		if (this.result != null) {
		Log.e(TAG, "Got a second completed screenshot for existing request!")
		@@ -161,53 +169,23 @@ constructor(
		viewModel.addActions(
		smartActions.map {
		ActionButtonViewModel(it.getIcon().loadDrawable(context), it.title, it.title) {
		sendPendingIntent(it.actionIntent)
		actionExecutor.sendPendingIntent(it.actionIntent)
		}
		}
		)
		}
		}

		override fun isPendingSharedTransition(): Boolean {
		return isPendingSharedTransition
		}

		private fun onDeferrableActionTapped(onResult: (ScreenshotSavedResult) -> Unit) {
		result?.let { onResult.invoke(it) } ?: run { pendingAction = onResult }
		}

		private fun startSharedTransition(
		intent: Intent,
		user: UserHandle,
		overrideTransition: Boolean
		) {
		isPendingSharedTransition = true
		applicationScope.launch("$TAG#launchIntentAsync") {
		actionExecutor.launchIntent(intent, windowTransition.invoke(), user, overrideTransition)
		}
		}

		private fun sendPendingIntent(pendingIntent: PendingIntent) {
		try {
		val options = BroadcastOptions.makeBasic()
		options.setInteractive(true)
		options.setPendingIntentBackgroundActivityStartMode(
		ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED
		)
		pendingIntent.send(options.toBundle())
		requestDismissal.invoke()
		} catch (e: PendingIntent.CanceledException) {
		Log.e(TAG, "Intent cancelled", e)
		}
		}

		@AssistedFactory
		interface Factory : ScreenshotActionsProvider.Factory {
		override fun create(
		request: ScreenshotData,
		requestId: String,
		windowTransition: () -> Pair<ActivityOptions, ExitTransitionCoordinator>,
		requestDismissal: () -> Unit,
		actionExecutor: ActionExecutor,
		): DefaultScreenshotActionsProvider
		}

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

+63 −190

File changed.

Preview size limit exceeded, changes collapsed.