Merge "Small fixes to screenshot->long screenshot transition" into sc-dev

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 499af2f6f869..63ecc0b89783 100644
--- a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java
+++ b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java
@@ -690,12 +690,8 @@ public class ScreenshotController {
                         intent.setFlags(
                                 Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
 
-                        Pair<ActivityOptions, ExitTransitionCoordinator> 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 {