Merge "Remove legacy screenshot notifications flow" into rvc-dev am: 1e9db44dc9 am: 288382cc2a (ed4981b8) · Commits · e / os / android_frameworks_base

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

+0 −2

Original line number	Diff line number	Diff line
		@@ -120,7 +120,6 @@ public class GlobalScreenshot implements ViewTreeObserver.OnComputeInternalInset
		public Consumer<Uri> finisher;
		public GlobalScreenshot.ActionsReadyListener mActionsReadyListener;
		public int errorMsgResId;
		public boolean createDeleteAction;

		void clearImage() {
		image = null;
		@@ -437,7 +436,6 @@ public class GlobalScreenshot implements ViewTreeObserver.OnComputeInternalInset
		data.image = mScreenBitmap;
		data.finisher = finisher;
		data.mActionsReadyListener = actionsReadyListener;
		data.createDeleteAction = false;

		if (mSaveInBgTask != null) {
		// just log success/failure for the pre-existing screenshot

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

deleted100644 → 0

+0 −567

File deleted.

Preview size limit exceeded, changes collapsed.

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

+0 −3

Original line number	Diff line number	Diff line
		@@ -88,7 +88,6 @@ class SaveImageInBackgroundTask extends AsyncTask<Void, Void, Void> {
		private final ScreenshotNotificationSmartActionsProvider mSmartActionsProvider;
		private final String mScreenshotId;
		private final boolean mSmartActionsEnabled;
		private final boolean mCreateDeleteAction;
		private final Random mRandom = new Random();

		SaveImageInBackgroundTask(Context context, GlobalScreenshot.SaveImageInBackgroundData data) {
		@@ -102,8 +101,6 @@ class SaveImageInBackgroundTask extends AsyncTask<Void, Void, Void> {
		mImageFileName = String.format(SCREENSHOT_FILE_NAME_TEMPLATE, imageDate);
		mScreenshotId = String.format(SCREENSHOT_ID_TEMPLATE, UUID.randomUUID());

		mCreateDeleteAction = data.createDeleteAction;

		// Initialize screenshot notification smart actions provider.
		mSmartActionsEnabled = DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_SYSTEMUI,
		SystemUiDeviceConfigFlags.ENABLE_SCREENSHOT_NOTIFICATION_SMART_ACTIONS, true);

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

+0 −78

Original line number	Diff line number	Diff line
		@@ -147,84 +147,6 @@ public class ScreenshotNotificationsController {
		mNotificationStyle.bigLargeIcon((Bitmap) null);
		}

		/**
		* Shows a notification to inform the user that a screenshot is currently being saved.
		*/
		public void showSavingScreenshotNotification() {
		final long now = System.currentTimeMillis();

		mPublicNotificationBuilder
		.setContentTitle(mResources.getString(R.string.screenshot_saving_title))
		.setSmallIcon(R.drawable.stat_notify_image)
		.setCategory(Notification.CATEGORY_PROGRESS)
		.setWhen(now)
		.setShowWhen(true)
		.setColor(mResources.getColor(
		com.android.internal.R.color.system_notification_accent_color));
		SystemUI.overrideNotificationAppName(mContext, mPublicNotificationBuilder, true);

		mNotificationBuilder
		.setContentTitle(mResources.getString(R.string.screenshot_saving_title))
		.setSmallIcon(R.drawable.stat_notify_image)
		.setWhen(now)
		.setShowWhen(true)
		.setColor(mResources.getColor(
		com.android.internal.R.color.system_notification_accent_color))
		.setStyle(mNotificationStyle)
		.setPublicVersion(mPublicNotificationBuilder.build());
		mNotificationBuilder.setFlag(Notification.FLAG_NO_CLEAR, true);
		SystemUI.overrideNotificationAppName(mContext, mNotificationBuilder, true);

		mNotificationManager.notify(SystemMessageProto.SystemMessage.NOTE_GLOBAL_SCREENSHOT,
		mNotificationBuilder.build());
		}

		/**
		* Shows a notification with the saved screenshot and actions that can be taken with it.
		*
		* @param actionData SavedImageData struct with image URI and actions
		*/
		public void showScreenshotActionsNotification(
		GlobalScreenshot.SavedImageData actionData) {
		mNotificationBuilder.addAction(actionData.shareAction);
		mNotificationBuilder.addAction(actionData.editAction);
		mNotificationBuilder.addAction(actionData.deleteAction);
		for (Notification.Action smartAction : actionData.smartActions) {
		mNotificationBuilder.addAction(smartAction);
		}

		// Create the intent to show the screenshot in gallery
		Intent launchIntent = new Intent(Intent.ACTION_VIEW);
		launchIntent.setDataAndType(actionData.uri, "image/png");
		launchIntent.setFlags(
		Intent.FLAG_ACTIVITY_NEW_TASK \| Intent.FLAG_GRANT_READ_URI_PERMISSION);

		final long now = System.currentTimeMillis();

		// Update the text and the icon for the existing notification
		mPublicNotificationBuilder
		.setContentTitle(mResources.getString(R.string.screenshot_saved_title))
		.setContentText(mResources.getString(R.string.screenshot_saved_text))
		.setContentIntent(PendingIntent.getActivity(mContext, 0, launchIntent, 0))
		.setWhen(now)
		.setAutoCancel(true)
		.setColor(mContext.getColor(
		com.android.internal.R.color.system_notification_accent_color));
		mNotificationBuilder
		.setContentTitle(mResources.getString(R.string.screenshot_saved_title))
		.setContentText(mResources.getString(R.string.screenshot_saved_text))
		.setContentIntent(PendingIntent.getActivity(mContext, 0, launchIntent, 0))
		.setWhen(now)
		.setAutoCancel(true)
		.setColor(mContext.getColor(
		com.android.internal.R.color.system_notification_accent_color))
		.setPublicVersion(mPublicNotificationBuilder.build())
		.setFlag(Notification.FLAG_NO_CLEAR, false);

		mNotificationManager.notify(SystemMessageProto.SystemMessage.NOTE_GLOBAL_SCREENSHOT,
		mNotificationBuilder.build());
		}

		/**
		* Shows a silent notification with the saved screenshot and actions that can be taken with it.
		*

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

+5 −30

Original line number	Diff line number	Diff line
		@@ -48,7 +48,6 @@ public class TakeScreenshotService extends Service {
		private static final String TAG = "TakeScreenshotService";

		private final GlobalScreenshot mScreenshot;
		private final GlobalScreenshotLegacy mScreenshotLegacy;
		private final UserManager mUserManager;
		private final UiEventLogger mUiEventLogger;

		@@ -81,9 +80,6 @@ public class TakeScreenshotService extends Service {
		return;
		}

		// TODO: clean up once notifications flow is fully deprecated
		boolean useCornerFlow = true;

		ScreenshotHelper.ScreenshotRequest screenshotRequest =
		(ScreenshotHelper.ScreenshotRequest) msg.obj;

		@@ -91,22 +87,10 @@ public class TakeScreenshotService extends Service {

		switch (msg.what) {
		case WindowManager.TAKE_SCREENSHOT_FULLSCREEN:
		if (useCornerFlow) {
		mScreenshot.takeScreenshot(uriConsumer, onComplete);
		} else {
		mScreenshotLegacy.takeScreenshot(
		uriConsumer, screenshotRequest.getHasStatusBar(),
		screenshotRequest.getHasNavBar());
		}
		break;
		case WindowManager.TAKE_SCREENSHOT_SELECTED_REGION:
		if (useCornerFlow) {
		mScreenshot.takeScreenshotPartial(uriConsumer, onComplete);
		} else {
		mScreenshotLegacy.takeScreenshotPartial(
		uriConsumer, screenshotRequest.getHasStatusBar(),
		screenshotRequest.getHasNavBar());
		}
		break;
		case WindowManager.TAKE_SCREENSHOT_PROVIDED_IMAGE:
		Bitmap screenshot = BitmapUtil.bundleToHardwareBitmap(
		@@ -116,13 +100,8 @@ public class TakeScreenshotService extends Service {
		int taskId = screenshotRequest.getTaskId();
		int userId = screenshotRequest.getUserId();
		ComponentName topComponent = screenshotRequest.getTopComponent();
		if (useCornerFlow) {
		mScreenshot.handleImageAsScreenshot(screenshot, screenBounds, insets,
		taskId, userId, topComponent, uriConsumer, onComplete);
		} else {
		mScreenshotLegacy.handleImageAsScreenshot(screenshot, screenBounds, insets,
		taskId, userId, topComponent, uriConsumer);
		}
		break;
		default:
		Log.d(TAG, "Invalid screenshot option: " + msg.what);
		@@ -131,11 +110,9 @@ public class TakeScreenshotService extends Service {
		};

		@Inject
		public TakeScreenshotService(GlobalScreenshot globalScreenshot,
		GlobalScreenshotLegacy globalScreenshotLegacy, UserManager userManager,
		public TakeScreenshotService(GlobalScreenshot globalScreenshot, UserManager userManager,
		UiEventLogger uiEventLogger) {
		mScreenshot = globalScreenshot;
		mScreenshotLegacy = globalScreenshotLegacy;
		mUserManager = userManager;
		mUiEventLogger = uiEventLogger;
		}
		@@ -148,8 +125,6 @@ public class TakeScreenshotService extends Service {
		@Override
		public boolean onUnbind(Intent intent) {
		if (mScreenshot != null) mScreenshot.stopScreenshot();
		// TODO remove once notifications flow is fully deprecated
		if (mScreenshotLegacy != null) mScreenshotLegacy.stopScreenshot();
		return true;
		}
		}