diff options
| author | 2022-10-24 17:59:35 +0000 | |
|---|---|---|
| committer | 2022-10-24 17:59:35 +0000 | |
| commit | f7ccbed31dd32d0adf75316eeab06df34dd9d232 (patch) | |
| tree | fa76036477dded4fea5b8cf3e7b18c0722e25074 | |
| parent | 83fbf2407d2ec6b16196fb9e7bbee6f1fee8536f (diff) | |
| parent | 61383ee21326cca9d87d8b235970169d4a64119f (diff) | |
Merge "Fix shared transitions from work profile" into tm-qpr-dev am: 7cacb22ac4 am: 61383ee213
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20232379
Change-Id: I6dec272bbbd057729bdb8b0efa6fbcf60a9fd7b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotView.java | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotView.java b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotView.java index 26cbcbf5214f..1b9cdd42dbf7 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotView.java +++ b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotView.java @@ -767,7 +767,9 @@ public class ScreenshotView extends FrameLayout implements mShareChip.setOnClickListener(v -> { mUiEventLogger.log(ScreenshotEvent.SCREENSHOT_SHARE_TAPPED, 0, mPackageName); if (mFlags.isEnabled(Flags.SCREENSHOT_WORK_PROFILE_POLICY)) { - mActionExecutor.launchIntentAsync(ActionIntentCreator.INSTANCE.createShareIntent( + prepareSharedTransition(); + mActionExecutor.launchIntentAsync( + ActionIntentCreator.INSTANCE.createShareIntent( imageData.uri, imageData.subject), imageData.shareTransition.get().bundle, imageData.owner.getIdentifier(), false); @@ -778,6 +780,7 @@ public class ScreenshotView extends FrameLayout implements mEditChip.setOnClickListener(v -> { mUiEventLogger.log(ScreenshotEvent.SCREENSHOT_EDIT_TAPPED, 0, mPackageName); if (mFlags.isEnabled(Flags.SCREENSHOT_WORK_PROFILE_POLICY)) { + prepareSharedTransition(); mActionExecutor.launchIntentAsync( ActionIntentCreator.INSTANCE.createEditIntent(imageData.uri, mContext), imageData.editTransition.get().bundle, @@ -789,6 +792,7 @@ public class ScreenshotView extends FrameLayout implements mScreenshotPreview.setOnClickListener(v -> { mUiEventLogger.log(ScreenshotEvent.SCREENSHOT_PREVIEW_TAPPED, 0, mPackageName); if (mFlags.isEnabled(Flags.SCREENSHOT_WORK_PROFILE_POLICY)) { + prepareSharedTransition(); mActionExecutor.launchIntentAsync( ActionIntentCreator.INSTANCE.createEditIntent(imageData.uri, mContext), imageData.editTransition.get().bundle, @@ -1064,6 +1068,12 @@ public class ScreenshotView extends FrameLayout implements } } + private void prepareSharedTransition() { + mPendingSharedTransition = true; + // fade out non-preview UI + createScreenshotFadeDismissAnimation().start(); + } + ValueAnimator createScreenshotFadeDismissAnimation() { ValueAnimator alphaAnim = ValueAnimator.ofFloat(0, 1); alphaAnim.addUpdateListener(animation -> { |