Merge "Revert "Add shared transitions for screenshot->markup"" (b326a72a) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/app/ChooserActivity.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -182,7 +182,7 @@ public class ChooserActivity extends ResolverActivity implements
		* To be used for shared element transition into this activity.
		* @hide
		*/
		public static final String FIRST_IMAGE_PREVIEW_TRANSITION_NAME = "screenshot_preview_image";
		public static final String FIRST_IMAGE_PREVIEW_TRANSITION_NAME = "chooser_preview_image_1";

		private static final String PREF_NUM_SHEET_EXPANSIONS = "pref_num_sheet_expansions";

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

+43 −48

Original line number	Diff line number	Diff line
		@@ -57,7 +57,7 @@ import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.config.sysui.SystemUiDeviceConfigFlags;
		import com.android.systemui.R;
		import com.android.systemui.SystemUIFactory;
		import com.android.systemui.screenshot.ScreenshotController.SavedImageData.ActionTransition;
		import com.android.systemui.screenshot.ScreenshotController.SavedImageData.ShareTransition;

		import java.io.File;
		import java.io.IOException;
		@@ -98,11 +98,11 @@ class SaveImageInBackgroundTask extends AsyncTask<Void, Void, Void> {
		private final String mScreenshotId;
		private final boolean mSmartActionsEnabled;
		private final Random mRandom = new Random();
		private final Supplier<ActionTransition> mSharedElementTransition;
		private final Supplier<ShareTransition> mSharedElementTransition;

		SaveImageInBackgroundTask(Context context, ScreenshotSmartActions screenshotSmartActions,
		ScreenshotController.SaveImageInBackgroundData data,
		Supplier<ActionTransition> sharedElementTransition) {
		Supplier<ShareTransition> sharedElementTransition) {
		mContext = context;
		mScreenshotSmartActions = screenshotSmartActions;
		mImageData = new ScreenshotController.SavedImageData();
		@@ -239,7 +239,7 @@ class SaveImageInBackgroundTask extends AsyncTask<Void, Void, Void> {
		mImageData.uri = uri;
		mImageData.smartActions = smartActions;
		mImageData.shareTransition = createShareAction(mContext, mContext.getResources(), uri);
		mImageData.editTransition = createEditAction(mContext, mContext.getResources(), uri);
		mImageData.editAction = createEditAction(mContext, mContext.getResources(), uri);
		mImageData.deleteAction = createDeleteAction(mContext, mContext.getResources(), uri);

		mParams.mActionsReadyListener.onActionsReady(mImageData);
		@@ -293,9 +293,9 @@ class SaveImageInBackgroundTask extends AsyncTask<Void, Void, Void> {
		* Assumes that the action intent is sent immediately after being supplied.
		*/
		@VisibleForTesting
		Supplier<ActionTransition> createShareAction(Context context, Resources r, Uri uri) {
		Supplier<ShareTransition> createShareAction(Context context, Resources r, Uri uri) {
		return () -> {
		ActionTransition transition = mSharedElementTransition.get();
		ShareTransition transition = mSharedElementTransition.get();

		// Note: Both the share and edit actions are proxied through ActionProxyReceiver in
		// order to do some common work like dismissing the keyguard and sending
		@@ -348,15 +348,13 @@ class SaveImageInBackgroundTask extends AsyncTask<Void, Void, Void> {
		Icon.createWithResource(r, R.drawable.ic_screenshot_share),
		r.getString(com.android.internal.R.string.share), shareAction);

		transition.action = shareActionBuilder.build();
		transition.shareAction = shareActionBuilder.build();
		return transition;
		};
		}

		@VisibleForTesting
		Supplier<ActionTransition> createEditAction(Context context, Resources r, Uri uri) {
		return () -> {
		ActionTransition transition = mSharedElementTransition.get();
		Notification.Action createEditAction(Context context, Resources r, Uri uri) {
		// Note: Both the share and edit actions are proxied through ActionProxyReceiver in
		// order to do some common work like dismissing the keyguard and sending
		// closeSystemWindows
		@@ -373,9 +371,8 @@ class SaveImageInBackgroundTask extends AsyncTask<Void, Void, Void> {
		editIntent.addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
		editIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK \| Intent.FLAG_ACTIVITY_CLEAR_TASK);

		PendingIntent pendingIntent = PendingIntent.getActivityAsUser(
		context, 0, editIntent, PendingIntent.FLAG_IMMUTABLE,
		transition.bundle, UserHandle.CURRENT);
		PendingIntent pendingIntent = PendingIntent.getActivityAsUser(context, 0,
		editIntent, PendingIntent.FLAG_IMMUTABLE, null, UserHandle.CURRENT);

		// Make sure pending intents for the system user are still unique across users
		// by setting the (otherwise unused) request code to the current user id.
		@@ -396,9 +393,7 @@ class SaveImageInBackgroundTask extends AsyncTask<Void, Void, Void> {
		Icon.createWithResource(r, R.drawable.ic_screenshot_edit),
		r.getString(com.android.internal.R.string.screenshot_edit), editAction);

		transition.action = editActionBuilder.build();
		return transition;
		};
		return editActionBuilder.build();
		}

		@VisibleForTesting

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

+12 −17

Original line number	Diff line number	Diff line
		@@ -78,7 +78,7 @@ import com.android.internal.logging.UiEventLogger;
		import com.android.internal.policy.PhoneWindow;
		import com.android.settingslib.applications.InterestingConfigChanges;
		import com.android.systemui.R;
		import com.android.systemui.screenshot.ScreenshotController.SavedImageData.ActionTransition;
		import com.android.systemui.screenshot.ScreenshotController.SavedImageData.ShareTransition;
		import com.android.systemui.util.DeviceConfigProxy;

		import java.util.List;
		@@ -111,17 +111,17 @@ public class ScreenshotController {
		*/
		static class SavedImageData {
		public Uri uri;
		public Supplier<ActionTransition> shareTransition;
		public Supplier<ActionTransition> editTransition;
		public Supplier<ShareTransition> shareTransition;
		public Notification.Action editAction;
		public Notification.Action deleteAction;
		public List<Notification.Action> smartActions;

		/**
		* POD for shared element transition.
		* POD for shared element transition to share sheet.
		*/
		static class ActionTransition {
		static class ShareTransition {
		public Bundle bundle;
		public Notification.Action action;
		public Notification.Action shareAction;
		public Runnable onCancelRunnable;
		}

		@@ -131,7 +131,7 @@ public class ScreenshotController {
		public void reset() {
		uri = null;
		shareTransition = null;
		editTransition = null;
		editAction = null;
		deleteAction = null;
		smartActions = null;
		}
		@@ -339,10 +339,6 @@ public class ScreenshotController {
		}
		}

		boolean isPendingSharedTransition() {
		return mScreenshotView.isPendingSharedTransition();
		}

		/**
		* Update resources on configuration change. Reinflate for theme/color changes.
		*/
		@@ -466,7 +462,7 @@ public class ScreenshotController {
		Log.d(TAG, "saveScreenshot: screenshotView is already attached, resetting. "
		+ "(dismissing=" + mScreenshotView.isDismissing() + ")");
		}
		reloadAssets();
		mScreenshotView.reset();
		}

		mScreenBitmap = screenshot;
		@@ -609,7 +605,7 @@ public class ScreenshotController {
		}

		mSaveInBgTask = new SaveImageInBackgroundTask(mContext, mScreenshotSmartActions, data,
		getActionTransitionSupplier());
		getShareTransitionSupplier());
		mSaveInBgTask.execute();
		}

		@@ -663,7 +659,7 @@ public class ScreenshotController {
		* Supplies the necessary bits for the shared element transition to share sheet.
		* Note that once supplied, the action intent to share must be sent immediately after.
		*/
		private Supplier<ActionTransition> getActionTransitionSupplier() {
		private Supplier<ShareTransition> getShareTransitionSupplier() {
		return () -> {
		ExitTransitionCallbacks cb = new ExitTransitionCallbacks() {
		@Override
		@@ -672,8 +668,7 @@ public class ScreenshotController {
		}

		@Override
		public void onFinish() {
		}
		public void onFinish() { }
		};

		Pair<ActivityOptions, ExitTransitionCoordinator> transition =
		@@ -682,7 +677,7 @@ public class ScreenshotController {
		ChooserActivity.FIRST_IMAGE_PREVIEW_TRANSITION_NAME));
		transition.second.startExit();

		ActionTransition supply = new ActionTransition();
		ShareTransition supply = new ShareTransition();
		supply.bundle = transition.first.toBundle();
		supply.onCancelRunnable = () -> ActivityOptions.stopSharedElementAnimation(mWindow);
		return supply;

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

+38 −53

Original line number	Diff line number	Diff line
		@@ -73,7 +73,7 @@ import android.widget.LinearLayout;

		import com.android.internal.logging.UiEventLogger;
		import com.android.systemui.R;
		import com.android.systemui.screenshot.ScreenshotController.SavedImageData.ActionTransition;
		import com.android.systemui.screenshot.ScreenshotController.SavedImageData.ShareTransition;
		import com.android.systemui.shared.system.QuickStepContract;

		import java.util.ArrayList;
		@@ -105,6 +105,7 @@ public class ScreenshotView extends FrameLayout implements
		private static final long SCREENSHOT_DISMISS_Y_DURATION_MS = 350;
		private static final long SCREENSHOT_DISMISS_ALPHA_DURATION_MS = 183;
		private static final long SCREENSHOT_DISMISS_ALPHA_OFFSET_MS = 50; // delay before starting fade
		private static final long SCREENSHOT_DISMISS_SHARE_OFFSET_MS = 300; // delay after share clicked
		private static final float SCREENSHOT_ACTIONS_START_SCALE_X = .7f;
		private static final float ROUNDED_CORNER_RADIUS = .05f;
		private static final int SWIPE_PADDING_DP = 12; // extra padding around views to allow swipe
		@@ -139,7 +140,7 @@ public class ScreenshotView extends FrameLayout implements
		private UiEventLogger mUiEventLogger;
		private ScreenshotViewCallback mCallbacks;
		private Animator mDismissAnimation;
		private boolean mPendingSharedTransition;
		private boolean mIgnoreDismiss;

		private final ArrayList<ScreenshotActionChip> mSmartChips = new ArrayList<>();
		private PendingInteraction mPendingInteraction;
		@@ -291,10 +292,6 @@ public class ScreenshotView extends FrameLayout implements
		requestFocus();
		}

		View getScreenshotPreview() {
		return mScreenshotPreview;
		}

		/**
		* Set up the logger and callback on dismissal.
		*
		@@ -532,22 +529,44 @@ public class ScreenshotView extends FrameLayout implements
		});
		return animator;
		}
		protected View getScreenshotPreview() {
		return mScreenshotPreview;
		}

		void setChipIntents(ScreenshotController.SavedImageData imageData) {
		mShareChip.setOnClickListener(v -> {
		ShareTransition transition = imageData.shareTransition.get();
		try {
		mIgnoreDismiss = true;
		transition.shareAction.actionIntent.send();
		mUiEventLogger.log(ScreenshotEvent.SCREENSHOT_SHARE_TAPPED);
		startSharedTransition(
		imageData.shareTransition.get());

		// Ensures that we delay dismissing until transition has started.
		postDelayed(() -> {
		mIgnoreDismiss = false;
		animateDismissal();
		}, SCREENSHOT_DISMISS_SHARE_OFFSET_MS);
		} catch (PendingIntent.CanceledException e) {
		mIgnoreDismiss = false;
		if (transition.onCancelRunnable != null) {
		transition.onCancelRunnable.run();
		}
		Log.e(TAG, "Share intent cancelled", e);
		}
		});
		mEditChip.setOnClickListener(v -> {
		mEditChip.setPendingIntent(imageData.editAction.actionIntent,
		() -> {
		mUiEventLogger.log(ScreenshotEvent.SCREENSHOT_EDIT_TAPPED);
		startSharedTransition(
		imageData.editTransition.get());
		animateDismissal();
		});
		mScreenshotPreview.setOnClickListener(v -> {
		try {
		imageData.editAction.actionIntent.send();
		} catch (PendingIntent.CanceledException e) {
		Log.e(TAG, "PendingIntent was cancelled", e);
		}
		mUiEventLogger.log(ScreenshotEvent.SCREENSHOT_PREVIEW_TAPPED);
		startSharedTransition(
		imageData.editTransition.get());
		animateDismissal();
		});

		if (mPendingInteraction != null) {
		@@ -586,16 +605,12 @@ public class ScreenshotView extends FrameLayout implements
		return (mDismissAnimation != null && mDismissAnimation.isRunning());
		}

		boolean isPendingSharedTransition() {
		return mPendingSharedTransition;
		}

		void animateDismissal() {
		animateDismissal(createScreenshotTranslateDismissAnimation());
		animateDismissal(createScreenshotDismissAnimation());
		}

		private void animateDismissal(Animator dismissAnimation) {
		if (mPendingSharedTransition) {
		if (mIgnoreDismiss) {
		return;
		}
		if (DEBUG_WINDOW) {
		@@ -650,7 +665,6 @@ public class ScreenshotView extends FrameLayout implements
		getViewTreeObserver().removeOnComputeInternalInsetsListener(this);
		// Clear any references to the bitmap
		mScreenshotPreview.setImageDrawable(null);
		mPendingSharedTransition = false;
		mActionsContainerBackground.setVisibility(View.GONE);
		mActionsContainer.setVisibility(View.GONE);
		mBackgroundProtection.setAlpha(0f);
		@@ -678,23 +692,7 @@ public class ScreenshotView extends FrameLayout implements
		mScreenshotSelectorView.stop();
		}

		private void startSharedTransition(ActionTransition transition) {
		try {
		mPendingSharedTransition = true;
		transition.action.actionIntent.send();

		// fade out non-preview UI
		createScreenshotFadeDismissAnimation().start();
		} catch (PendingIntent.CanceledException e) {
		mPendingSharedTransition = false;
		if (transition.onCancelRunnable != null) {
		transition.onCancelRunnable.run();
		}
		Log.e(TAG, "Intent cancelled", e);
		}
		}

		private AnimatorSet createScreenshotTranslateDismissAnimation() {
		private AnimatorSet createScreenshotDismissAnimation() {
		ValueAnimator alphaAnim = ValueAnimator.ofFloat(0, 1);
		alphaAnim.setStartDelay(SCREENSHOT_DISMISS_ALPHA_OFFSET_MS);
		alphaAnim.setDuration(SCREENSHOT_DISMISS_ALPHA_DURATION_MS);
		@@ -721,19 +719,6 @@ public class ScreenshotView extends FrameLayout implements
		return animSet;
		}

		private ValueAnimator createScreenshotFadeDismissAnimation() {
		ValueAnimator alphaAnim = ValueAnimator.ofFloat(0, 1);
		alphaAnim.addUpdateListener(animation -> {
		float alpha = 1 - animation.getAnimatedFraction();
		mDismissButton.setAlpha(alpha);
		mActionsContainerBackground.setAlpha(alpha);
		mActionsContainer.setAlpha(alpha);
		mBackgroundProtection.setAlpha(alpha);
		});
		alphaAnim.setDuration(600);
		return alphaAnim;
		}

		/**
		* Create a drawable using the size of the bitmap and insets as the fractional inset parameters.
		*/

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

+1 −3

Original line number	Diff line number	Diff line
		@@ -72,11 +72,9 @@ public class TakeScreenshotService extends Service {
		if (DEBUG_DISMISS) {
		Log.d(TAG, "Received ACTION_CLOSE_SYSTEM_DIALOGS");
		}
		if (!mScreenshot.isPendingSharedTransition()) {
		mScreenshot.dismissScreenshot(false);
		}
		}
		}
		};

		@Inject