From d148ef32dae2b87ce1e5315bbae3ba751a1c6ec0 Mon Sep 17 00:00:00 2001 From: Miranda Kephart Date: Fri, 25 Jun 2021 16:31:51 -0400 Subject: Small fixes to screenshot->long screenshot transition Hide the enterTransitionView so it doesn't conflict with the "shared transition" view. Also turn off activity animations so that the LongScreenshotActivity appears immediately instead of fading in from the previous app. Bug: 183197533 Test: manual Change-Id: I6fba0012c72201f23c644148dde73a35627ee761 --- packages/SystemUI/res/layout/long_screenshot.xml | 1 + .../com/android/systemui/screenshot/LongScreenshotActivity.java | 2 -- .../src/com/android/systemui/screenshot/ScreenshotController.java | 8 ++------ 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/packages/SystemUI/res/layout/long_screenshot.xml b/packages/SystemUI/res/layout/long_screenshot.xml index 3f4baaf27b84..50f38b6fa67f 100644 --- a/packages/SystemUI/res/layout/long_screenshot.xml +++ b/packages/SystemUI/res/layout/long_screenshot.xml @@ -78,6 +78,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:scaleType="matrix" + android:visibility="invisible" app:layout_constraintTop_toTopOf="@id/preview" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/LongScreenshotActivity.java b/packages/SystemUI/src/com/android/systemui/screenshot/LongScreenshotActivity.java index 07f6d36cbec1..741dddc49378 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/LongScreenshotActivity.java +++ b/packages/SystemUI/src/com/android/systemui/screenshot/LongScreenshotActivity.java @@ -200,7 +200,6 @@ public class LongScreenshotActivity extends Activity { / (float) mLongScreenshot.getHeight()); mEnterTransitionView.setImageDrawable(drawable); - mEnterTransitionView.getViewTreeObserver().addOnPreDrawListener( new ViewTreeObserver.OnPreDrawListener() { @Override @@ -220,7 +219,6 @@ public class LongScreenshotActivity extends Activity { mCropView.animateEntrance(); mCropView.setVisibility(View.VISIBLE); setButtonsEnabled(true); - mEnterTransitionView.setVisibility(View.GONE); }); }); return true; diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java index 24cca91ea3f3..1c769ef241a1 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java +++ b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java @@ -682,12 +682,8 @@ public class ScreenshotController { intent.setFlags( Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP); - Pair transition = - ActivityOptions.startSharedElementAnimation(mWindow, - new ScreenshotExitTransitionCallbacksSupplier(false).get(), - null); - transition.second.startExit(); - mContext.startActivity(intent, transition.first.toBundle()); + mContext.startActivity(intent, + ActivityOptions.makeCustomAnimation(mContext, 0, 0).toBundle()); RemoteAnimationAdapter runner = new RemoteAnimationAdapter( SCREENSHOT_REMOTE_RUNNER, 0, 0); try { -- cgit v1.2.3-59-g8ed1b