Merge changes Ic3d9c27a,I84314ce9,I19a09824 into 24D1-dev
* changes:
Move screenshot thumbnail above actions
Remove all usages of SCREENSHOT_METADATA flag
Switch to callback version of ScreenshotActionsProvider
diff --git a/packages/SystemUI/res/layout/screenshot_shelf.xml b/packages/SystemUI/res/layout/screenshot_shelf.xml
index ef1a21f..c988b4a 100644
--- a/packages/SystemUI/res/layout/screenshot_shelf.xml
+++ b/packages/SystemUI/res/layout/screenshot_shelf.xml
@@ -28,7 +28,7 @@
android:elevation="4dp"
android:background="@drawable/action_chip_container_background"
android:layout_marginStart="@dimen/overlay_action_container_margin_horizontal"
- android:layout_marginBottom="@dimen/overlay_action_container_margin_bottom"
+ android:layout_marginBottom="@dimen/screenshot_shelf_vertical_margin"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/actions_container"
app:layout_constraintEnd_toEndOf="@+id/actions_container"
@@ -38,14 +38,14 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/overlay_action_container_margin_horizontal"
- android:paddingEnd="@dimen/overlay_action_container_padding_end"
+ android:paddingHorizontal="@dimen/overlay_action_container_padding_end"
android:paddingVertical="@dimen/overlay_action_container_padding_vertical"
android:elevation="4dp"
android:scrollbars="none"
app:layout_constraintHorizontal_bias="0"
app:layout_constraintWidth_percent="1.0"
app:layout_constraintWidth_max="wrap"
- app:layout_constraintStart_toEndOf="@+id/screenshot_preview_border"
+ app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="@id/actions_container_background">
<LinearLayout
@@ -65,16 +65,16 @@
android:id="@+id/screenshot_preview_border"
android:layout_width="0dp"
android:layout_height="0dp"
- android:layout_marginStart="16dp"
+ android:layout_marginStart="@dimen/overlay_action_container_margin_horizontal"
android:layout_marginTop="@dimen/overlay_border_width_neg"
android:layout_marginEnd="@dimen/overlay_border_width_neg"
- android:layout_marginBottom="14dp"
+ android:layout_marginBottom="@dimen/screenshot_shelf_vertical_margin"
android:elevation="8dp"
android:background="@drawable/overlay_border"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/screenshot_preview"
app:layout_constraintEnd_toEndOf="@id/screenshot_preview"
- app:layout_constraintBottom_toBottomOf="parent"/>
+ app:layout_constraintBottom_toTopOf="@id/actions_container"/>
<ImageView
android:id="@+id/screenshot_preview"
android:layout_width="@dimen/overlay_x_scale"
diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
index b7eff38..a0fca51 100644
--- a/packages/SystemUI/res/values/dimens.xml
+++ b/packages/SystemUI/res/values/dimens.xml
@@ -448,6 +448,7 @@
<dimen name="overlay_action_container_padding_end">8dp</dimen>
<dimen name="overlay_dismiss_button_tappable_size">48dp</dimen>
<dimen name="overlay_dismiss_button_margin">8dp</dimen>
+ <dimen name="screenshot_shelf_vertical_margin">8dp</dimen>
<!-- must be kept aligned with overlay_border_width_neg, below;
overlay_border_width = overlay_border_width_neg * -1 -->
<dimen name="overlay_border_width">4dp</dimen>
diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotActionsProvider.kt b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotActionsProvider.kt
index abdbd68..97acccd 100644
--- a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotActionsProvider.kt
+++ b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotActionsProvider.kt
@@ -26,34 +26,45 @@
import javax.inject.Inject
/**
- * Provides static actions for screenshots. This class can be overridden by a vendor-specific SysUI
+ * Provides actions for screenshots. This class can be overridden by a vendor-specific SysUI
* implementation.
*/
interface ScreenshotActionsProvider {
data class ScreenshotAction(
- val icon: Drawable?,
- val text: String?,
- val overrideTransition: Boolean,
+ val icon: Drawable? = null,
+ val text: String? = null,
+ val description: String,
+ val overrideTransition: Boolean = false,
val retrieveIntent: (Uri) -> Intent
)
- fun getPreviewAction(context: Context, uri: Uri, user: UserHandle): Intent
- fun getActions(context: Context, user: UserHandle): List<ScreenshotAction>
-}
-
-class DefaultScreenshotActionsProvider @Inject constructor() : ScreenshotActionsProvider {
- override fun getPreviewAction(context: Context, uri: Uri, user: UserHandle): Intent {
- return ActionIntentCreator.createEdit(uri, context)
+ interface ScreenshotActionsCallback {
+ fun setPreviewAction(overrideTransition: Boolean = false, retrieveIntent: (Uri) -> Intent)
+ fun addAction(action: ScreenshotAction) = addActions(listOf(action))
+ fun addActions(actions: List<ScreenshotAction>)
}
- override fun getActions(
- context: Context,
- user: UserHandle
- ): List<ScreenshotActionsProvider.ScreenshotAction> {
+ interface Factory {
+ fun create(
+ context: Context,
+ user: UserHandle?,
+ callback: ScreenshotActionsCallback
+ ): ScreenshotActionsProvider
+ }
+}
+
+class DefaultScreenshotActionsProvider(
+ private val context: Context,
+ private val user: UserHandle?,
+ private val callback: ScreenshotActionsProvider.ScreenshotActionsCallback
+) : ScreenshotActionsProvider {
+ init {
+ callback.setPreviewAction(true) { ActionIntentCreator.createEdit(it, context) }
val editAction =
ScreenshotActionsProvider.ScreenshotAction(
AppCompatResources.getDrawable(context, R.drawable.ic_screenshot_edit),
context.resources.getString(R.string.screenshot_edit_label),
+ context.resources.getString(R.string.screenshot_edit_description),
true
) { uri ->
ActionIntentCreator.createEdit(uri, context)
@@ -62,10 +73,21 @@
ScreenshotActionsProvider.ScreenshotAction(
AppCompatResources.getDrawable(context, R.drawable.ic_screenshot_share),
context.resources.getString(R.string.screenshot_share_label),
+ context.resources.getString(R.string.screenshot_share_description),
false
) { uri ->
ActionIntentCreator.createShare(uri)
}
- return listOf(editAction, shareAction)
+ callback.addActions(listOf(editAction, shareAction))
+ }
+
+ class Factory @Inject constructor() : ScreenshotActionsProvider.Factory {
+ override fun create(
+ context: Context,
+ user: UserHandle?,
+ callback: ScreenshotActionsProvider.ScreenshotActionsCallback
+ ): ScreenshotActionsProvider {
+ return DefaultScreenshotActionsProvider(context, user, callback)
+ }
}
}
diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java
index c8e13bb..597e773 100644
--- a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java
+++ b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java
@@ -19,6 +19,7 @@
import static android.content.res.Configuration.ORIENTATION_PORTRAIT;
import static android.view.WindowManager.LayoutParams.TYPE_SCREENSHOT;
+import static com.android.systemui.Flags.screenshotShelfUi;
import static com.android.systemui.screenshot.LogConfig.DEBUG_ANIM;
import static com.android.systemui.screenshot.LogConfig.DEBUG_CALLBACK;
import static com.android.systemui.screenshot.LogConfig.DEBUG_INPUT;
@@ -40,7 +41,6 @@
import android.app.ExitTransitionCoordinator;
import android.app.ICompatCameraControlCallback;
import android.app.Notification;
-import android.app.assist.AssistContent;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
@@ -84,7 +84,6 @@
import com.android.systemui.clipboardoverlay.ClipboardOverlayController;
import com.android.systemui.dagger.qualifiers.Main;
import com.android.systemui.flags.FeatureFlags;
-import com.android.systemui.flags.Flags;
import com.android.systemui.res.R;
import com.android.systemui.screenshot.TakeScreenshotService.RequestCallback;
import com.android.systemui.screenshot.scroll.LongScreenshotActivity;
@@ -237,6 +236,7 @@
private final WindowContext mContext;
private final FeatureFlags mFlags;
private final ScreenshotViewProxy mViewProxy;
+ private final ScreenshotActionsProvider.Factory mActionsProviderFactory;
private final ScreenshotNotificationsController mNotificationsController;
private final ScreenshotSmartActions mScreenshotSmartActions;
private final UiEventLogger mUiEventLogger;
@@ -271,6 +271,8 @@
private boolean mScreenshotTakenInPortrait;
private boolean mBlockAttach;
+ private ScreenshotActionsProvider mActionsProvider;
+
private Animator mScreenshotAnimation;
private RequestCallback mCurrentRequestCallback;
private String mPackageName = "";
@@ -298,6 +300,7 @@
Context context,
FeatureFlags flags,
ScreenshotViewProxy.Factory viewProxyFactory,
+ ScreenshotActionsProvider.Factory actionsProviderFactory,
ScreenshotSmartActions screenshotSmartActions,
ScreenshotNotificationsController.Factory screenshotNotificationsControllerFactory,
ScrollCaptureClient scrollCaptureClient,
@@ -349,6 +352,7 @@
mAssistContentRequester = assistContentRequester;
mViewProxy = viewProxyFactory.getProxy(mContext, mDisplayId);
+ mActionsProviderFactory = actionsProviderFactory;
mScreenshotHandler.setOnTimeoutRunnable(() -> {
if (DEBUG_UI) {
@@ -393,6 +397,7 @@
void handleScreenshot(ScreenshotData screenshot, Consumer<Uri> finisher,
RequestCallback requestCallback) {
Assert.isMainThread();
+
mCurrentRequestCallback = requestCallback;
if (screenshot.getType() == WindowManager.TAKE_SCREENSHOT_FULLSCREEN) {
Rect bounds = getFullScreenRect();
@@ -435,16 +440,6 @@
prepareViewForNewScreenshot(screenshot, oldPackageName);
- if (mFlags.isEnabled(Flags.SCREENSHOT_METADATA) && screenshot.getTaskId() >= 0) {
- mAssistContentRequester.requestAssistContent(screenshot.getTaskId(),
- new AssistContentRequester.Callback() {
- @Override
- public void onAssistContentAvailable(AssistContent assistContent) {
- screenshot.setContextUrl(assistContent.getWebUri());
- }
- });
- }
-
if (!shouldShowUi()) {
saveScreenshotInWorkerThread(
screenshot.getUserHandle(), finisher, this::logSuccessOnActionsReady,
@@ -496,7 +491,7 @@
return mDisplayId == Display.DEFAULT_DISPLAY || mShowUIOnExternalDisplay;
}
- void prepareViewForNewScreenshot(ScreenshotData screenshot, String oldPackageName) {
+ void prepareViewForNewScreenshot(@NonNull ScreenshotData screenshot, String oldPackageName) {
withWindowAttached(() -> {
if (mUserManager.isManagedProfile(screenshot.getUserHandle().getIdentifier())) {
mViewProxy.announceForAccessibility(mContext.getResources().getString(
@@ -509,6 +504,11 @@
mViewProxy.reset();
+ if (screenshotShelfUi()) {
+ mActionsProvider = mActionsProviderFactory.create(mContext, screenshot.getUserHandle(),
+ ((ScreenshotActionsProvider.ScreenshotActionsCallback) mViewProxy));
+ }
+
if (mViewProxy.isAttachedToWindow()) {
// if we didn't already dismiss for another reason
if (!mViewProxy.isDismissing()) {
@@ -983,20 +983,16 @@
@Override
public void onAnimationEnd(Animator animation) {
super.onAnimationEnd(animation);
- doPostAnimation(imageData);
+ mViewProxy.setChipIntents(imageData);
}
});
} else {
- doPostAnimation(imageData);
+ mViewProxy.setChipIntents(imageData);
}
});
}
}
- private void doPostAnimation(ScreenshotController.SavedImageData imageData) {
- mViewProxy.setChipIntents(imageData);
- }
-
/**
* Sets up the action shade and its entrance animation, once we get the Quick Share action data.
*/
diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotShelfViewProxy.kt b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotShelfViewProxy.kt
index 9354fd2..88bca95 100644
--- a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotShelfViewProxy.kt
+++ b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotShelfViewProxy.kt
@@ -20,8 +20,10 @@
import android.animation.AnimatorListenerAdapter
import android.app.Notification
import android.content.Context
+import android.content.Intent
import android.graphics.Bitmap
import android.graphics.Rect
+import android.net.Uri
import android.view.KeyEvent
import android.view.LayoutInflater
import android.view.ScrollCaptureResponse
@@ -37,6 +39,7 @@
import com.android.systemui.screenshot.LogConfig.DEBUG_DISMISS
import com.android.systemui.screenshot.LogConfig.DEBUG_INPUT
import com.android.systemui.screenshot.LogConfig.DEBUG_WINDOW
+import com.android.systemui.screenshot.ScreenshotController.SavedImageData
import com.android.systemui.screenshot.ScreenshotEvent.SCREENSHOT_DISMISSED_OTHER
import com.android.systemui.screenshot.scroll.ScrollCaptureController
import com.android.systemui.screenshot.ui.ScreenshotAnimationController
@@ -54,10 +57,9 @@
constructor(
private val logger: UiEventLogger,
private val viewModel: ScreenshotViewModel,
- private val staticActionsProvider: ScreenshotActionsProvider,
@Assisted private val context: Context,
@Assisted private val displayId: Int
-) : ScreenshotViewProxy {
+) : ScreenshotViewProxy, ScreenshotActionsProvider.ScreenshotActionsCallback {
override val view: ScreenshotShelfView =
LayoutInflater.from(context).inflate(R.layout.screenshot_shelf, null) as ScreenshotShelfView
override val screenshotPreview: View
@@ -75,6 +77,8 @@
override var isPendingSharedTransition = false
private val animationController = ScreenshotAnimationController(view)
+ private var imageData: SavedImageData? = null
+ private var runOnImageDataAcquired: ((SavedImageData) -> Unit)? = null
init {
ScreenshotShelfViewBinder.bind(view, viewModel, LayoutInflater.from(context))
@@ -87,8 +91,9 @@
override fun reset() {
animationController.cancel()
isPendingSharedTransition = false
- viewModel.setScreenshotBitmap(null)
- viewModel.setActions(listOf())
+ imageData = null
+ viewModel.reset()
+ runOnImageDataAcquired = null
}
override fun updateInsets(insets: WindowInsets) {}
override fun updateOrientation(insets: WindowInsets) {}
@@ -99,18 +104,9 @@
override fun addQuickShareChip(quickShareAction: Notification.Action) {}
- override fun setChipIntents(imageData: ScreenshotController.SavedImageData) {
- val staticActions =
- staticActionsProvider.getActions(context, imageData.owner).map {
- ActionButtonViewModel(it.icon, it.text) {
- val intent = it.retrieveIntent(imageData.uri)
- debugLog(DEBUG_ACTIONS) { "Action tapped: $intent" }
- isPendingSharedTransition = true
- callbacks?.onAction(intent, imageData.owner, it.overrideTransition)
- }
- }
-
- viewModel.setActions(staticActions)
+ override fun setChipIntents(data: SavedImageData) {
+ imageData = data
+ runOnImageDataAcquired?.invoke(data)
}
override fun requestDismissal(event: ScreenshotEvent) {
@@ -223,4 +219,41 @@
interface Factory : ScreenshotViewProxy.Factory {
override fun getProxy(context: Context, displayId: Int): ScreenshotShelfViewProxy
}
+
+ override fun setPreviewAction(overrideTransition: Boolean, retrieveIntent: (Uri) -> Intent) {
+ viewModel.setPreviewAction {
+ imageData?.let {
+ val intent = retrieveIntent(it.uri)
+ debugLog(DEBUG_ACTIONS) { "Preview tapped: $intent" }
+ isPendingSharedTransition = true
+ callbacks?.onAction(intent, it.owner, overrideTransition)
+ }
+ }
+ }
+
+ override fun addActions(actions: List<ScreenshotActionsProvider.ScreenshotAction>) {
+ viewModel.addActions(
+ actions.map { action ->
+ ActionButtonViewModel(action.icon, action.text, action.description) {
+ val actionRunnable =
+ getActionRunnable(action.retrieveIntent, action.overrideTransition)
+ imageData?.let { actionRunnable(it) }
+ ?: run { runOnImageDataAcquired = actionRunnable }
+ }
+ }
+ )
+ }
+
+ private fun getActionRunnable(
+ retrieveIntent: (Uri) -> Intent,
+ overrideTransition: Boolean
+ ): (SavedImageData) -> Unit {
+ val onClick: (SavedImageData) -> Unit = {
+ val intent = retrieveIntent(it.uri)
+ debugLog(DEBUG_ACTIONS) { "Action tapped: $intent" }
+ isPendingSharedTransition = true
+ callbacks!!.onAction(intent, it.owner, overrideTransition)
+ }
+ return onClick
+ }
}
diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotView.java b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotView.java
index cb2dba0..65e8457 100644
--- a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotView.java
+++ b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotView.java
@@ -90,7 +90,6 @@
import com.android.internal.jank.InteractionJankMonitor;
import com.android.internal.logging.UiEventLogger;
import com.android.systemui.flags.FeatureFlags;
-import com.android.systemui.flags.Flags;
import com.android.systemui.res.R;
import com.android.systemui.screenshot.scroll.ScrollCaptureController;
import com.android.systemui.shared.system.InputChannelCompat;
@@ -789,15 +788,8 @@
mUiEventLogger.log(ScreenshotEvent.SCREENSHOT_SHARE_TAPPED, 0, mPackageName);
prepareSharedTransition();
- Intent shareIntent;
- if (mFlags.isEnabled(Flags.SCREENSHOT_METADATA) && mScreenshotData != null
- && mScreenshotData.getContextUrl() != null) {
- shareIntent = ActionIntentCreator.INSTANCE.createShareWithText(
- imageData.uri, mScreenshotData.getContextUrl().toString());
- } else {
- shareIntent = ActionIntentCreator.INSTANCE.createShareWithSubject(
- imageData.uri, imageData.subject);
- }
+ Intent shareIntent = ActionIntentCreator.INSTANCE.createShareWithSubject(
+ imageData.uri, imageData.subject);
mCallbacks.onAction(shareIntent, imageData.owner, false);
});
diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/dagger/ScreenshotModule.java b/packages/SystemUI/src/com/android/systemui/screenshot/dagger/ScreenshotModule.java
index 9118ee1..2ce6d83 100644
--- a/packages/SystemUI/src/com/android/systemui/screenshot/dagger/ScreenshotModule.java
+++ b/packages/SystemUI/src/com/android/systemui/screenshot/dagger/ScreenshotModule.java
@@ -94,8 +94,8 @@
ScreenshotSoundControllerImpl screenshotSoundProviderImpl);
@Binds
- abstract ScreenshotActionsProvider bindScreenshotActionsProvider(
- DefaultScreenshotActionsProvider defaultScreenshotActionsProvider);
+ abstract ScreenshotActionsProvider.Factory bindScreenshotActionsProviderFactory(
+ DefaultScreenshotActionsProvider.Factory defaultScreenshotActionsProviderFactory);
@Provides
@SysUISingleton
diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ui/binder/ActionButtonViewBinder.kt b/packages/SystemUI/src/com/android/systemui/screenshot/ui/binder/ActionButtonViewBinder.kt
index a5825b5..c7fe3f6 100644
--- a/packages/SystemUI/src/com/android/systemui/screenshot/ui/binder/ActionButtonViewBinder.kt
+++ b/packages/SystemUI/src/com/android/systemui/screenshot/ui/binder/ActionButtonViewBinder.kt
@@ -36,6 +36,7 @@
} else {
view.setOnClickListener(null)
}
+ view.contentDescription = viewModel.description
view.visibility = View.VISIBLE
view.alpha = 1f
}
diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ui/binder/ScreenshotShelfViewBinder.kt b/packages/SystemUI/src/com/android/systemui/screenshot/ui/binder/ScreenshotShelfViewBinder.kt
index 3bcd52c..d878200 100644
--- a/packages/SystemUI/src/com/android/systemui/screenshot/ui/binder/ScreenshotShelfViewBinder.kt
+++ b/packages/SystemUI/src/com/android/systemui/screenshot/ui/binder/ScreenshotShelfViewBinder.kt
@@ -59,6 +59,11 @@
}
}
launch {
+ viewModel.previewAction.collect { onClick ->
+ previewView.setOnClickListener { onClick?.run() }
+ }
+ }
+ launch {
viewModel.actions.collect { actions ->
if (actions.isNotEmpty()) {
view
diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ui/viewmodel/ActionButtonViewModel.kt b/packages/SystemUI/src/com/android/systemui/screenshot/ui/viewmodel/ActionButtonViewModel.kt
index 6ee9705..05bfed1 100644
--- a/packages/SystemUI/src/com/android/systemui/screenshot/ui/viewmodel/ActionButtonViewModel.kt
+++ b/packages/SystemUI/src/com/android/systemui/screenshot/ui/viewmodel/ActionButtonViewModel.kt
@@ -20,6 +20,7 @@
data class ActionButtonViewModel(
val icon: Drawable?,
- val name: String?,
+ val name: CharSequence?,
+ val description: CharSequence,
val onClicked: (() -> Unit)?
)
diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ui/viewmodel/ScreenshotViewModel.kt b/packages/SystemUI/src/com/android/systemui/screenshot/ui/viewmodel/ScreenshotViewModel.kt
index 3a652d9..dc61d1e 100644
--- a/packages/SystemUI/src/com/android/systemui/screenshot/ui/viewmodel/ScreenshotViewModel.kt
+++ b/packages/SystemUI/src/com/android/systemui/screenshot/ui/viewmodel/ScreenshotViewModel.kt
@@ -24,6 +24,8 @@
class ScreenshotViewModel(private val accessibilityManager: AccessibilityManager) {
private val _preview = MutableStateFlow<Bitmap?>(null)
val preview: StateFlow<Bitmap?> = _preview
+ private val _previewAction = MutableStateFlow<Runnable?>(null)
+ val previewAction: StateFlow<Runnable?> = _previewAction
private val _actions = MutableStateFlow(emptyList<ActionButtonViewModel>())
val actions: StateFlow<List<ActionButtonViewModel>> = _actions
val showDismissButton: Boolean
@@ -33,7 +35,19 @@
_preview.value = bitmap
}
- fun setActions(actions: List<ActionButtonViewModel>) {
- _actions.value = actions
+ fun setPreviewAction(runnable: Runnable) {
+ _previewAction.value = runnable
+ }
+
+ fun addActions(actions: List<ActionButtonViewModel>) {
+ val actionList = _actions.value.toMutableList()
+ actionList.addAll(actions)
+ _actions.value = actionList
+ }
+
+ fun reset() {
+ _preview.value = null
+ _previewAction.value = null
+ _actions.value = listOf()
}
}