Merge "Update screenshot class visibilities for app clips." into tm-qpr-dev (3e7dab65) · Commits · e / os / android_frameworks_base

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

+12 −10

Original line number	Diff line number	Diff line
		@@ -57,7 +57,8 @@ import java.util.concurrent.Executor;

		import javax.inject.Inject;

		class ImageExporter {
		/** A class to help with exporting screenshot to storage. */
		public class ImageExporter {
		private static final String TAG = LogConfig.logTag(ImageExporter.class);

		static final Duration PENDING_ENTRY_TTL = Duration.ofHours(24);
		@@ -90,7 +91,7 @@ class ImageExporter {
		private final FeatureFlags mFlags;

		@Inject
		ImageExporter(ContentResolver resolver, FeatureFlags flags) {
		public ImageExporter(ContentResolver resolver, FeatureFlags flags) {
		mResolver = resolver;
		mFlags = flags;
		}
		@@ -148,7 +149,7 @@ class ImageExporter {
		*
		* @return a listenable future result
		*/
		ListenableFuture<Result> export(Executor executor, UUID requestId, Bitmap bitmap,
		public ListenableFuture<Result> export(Executor executor, UUID requestId, Bitmap bitmap,
		UserHandle owner) {
		return export(executor, requestId, bitmap, ZonedDateTime.now(), owner);
		}
		@@ -181,13 +182,14 @@ class ImageExporter {
		);
		}

		static class Result {
		Uri uri;
		UUID requestId;
		String fileName;
		long timestamp;
		CompressFormat format;
		boolean published;
		/** The result returned by the task exporting screenshots to storage. */
		public static class Result {
		public Uri uri;
		public UUID requestId;
		public String fileName;
		public long timestamp;
		public CompressFormat format;
		public boolean published;

		@Override
		public String toString() {

+1 −7

Original line number	Diff line number	Diff line
		@@ -93,13 +93,7 @@ public enum ScreenshotEvent implements UiEventLogger.UiEventEnum {
		@UiEvent(doc = "User has discarded the result of a long screenshot")
		SCREENSHOT_LONG_SCREENSHOT_EXIT(911),
		@UiEvent(doc = "A screenshot has been taken and saved to work profile")
		SCREENSHOT_SAVED_TO_WORK_PROFILE(1240),
		@UiEvent(doc = "Notes application triggered the screenshot for notes")
		SCREENSHOT_FOR_NOTE_TRIGGERED(1308),
		@UiEvent(doc = "User accepted the screenshot to be sent to the notes app")
		SCREENSHOT_FOR_NOTE_ACCEPTED(1309),
		@UiEvent(doc = "User cancelled the screenshot for notes app flow")
		SCREENSHOT_FOR_NOTE_CANCELLED(1310);
		SCREENSHOT_SAVED_TO_WORK_PROFILE(1240);

		private final int mId;