From 72a2207907e257a267dc5c3a96fb9998c2642011 Mon Sep 17 00:00:00 2001 From: Miranda Kephart Date: Tue, 13 Jul 2021 19:37:27 +0000 Subject: [PATCH] Revert "Fix shared transition offsets in landscape" This reverts commit 455fa76194a15ac873df6e43857f99c5c080515e. Reason for revert: Obsolete now that the offset issue is fixed in the framework Bug:190757843 Change-Id: I47dedda772d4b62dbf134f9ea5cc9293b27cb277 Merged-In: I47dedda772d4b62dbf134f9ea5cc9293b27cb277 --- .../SystemUI/res/layout/global_screenshot_static.xml | 9 --------- .../systemui/screenshot/LongScreenshotActivity.java | 9 +-------- .../systemui/screenshot/ScreenshotController.java | 4 +--- .../android/systemui/screenshot/ScreenshotView.java | 12 ++---------- 4 files changed, 4 insertions(+), 30 deletions(-) diff --git a/packages/SystemUI/res/layout/global_screenshot_static.xml b/packages/SystemUI/res/layout/global_screenshot_static.xml index e4a96947aa6af..665d4a04b00b6 100644 --- a/packages/SystemUI/res/layout/global_screenshot_static.xml +++ b/packages/SystemUI/res/layout/global_screenshot_static.xml @@ -131,13 +131,4 @@ app:layout_constraintStart_toStartOf="@id/global_screenshot_preview" app:layout_constraintTop_toTopOf="@id/global_screenshot_preview" android:elevation="@dimen/screenshot_preview_elevation"/> - diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/LongScreenshotActivity.java b/packages/SystemUI/src/com/android/systemui/screenshot/LongScreenshotActivity.java index 0eaef72ae29b2..c5b26ee4954ec 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/LongScreenshotActivity.java +++ b/packages/SystemUI/src/com/android/systemui/screenshot/LongScreenshotActivity.java @@ -321,18 +321,11 @@ public class LongScreenshotActivity extends Activity { | Intent.FLAG_GRANT_WRITE_URI_PERMISSION); mTransitionView.setImageBitmap(mOutputBitmap); + mTransitionView.setVisibility(View.VISIBLE); mTransitionView.setTransitionName( ChooserActivity.FIRST_IMAGE_PREVIEW_TRANSITION_NAME); // TODO: listen for transition completing instead of finishing onStop mTransitionStarted = true; - int[] locationOnScreen = new int[2]; - mTransitionView.getLocationOnScreen(locationOnScreen); - int[] locationInWindow = new int[2]; - mTransitionView.getLocationInWindow(locationInWindow); - int deltaX = locationOnScreen[0] - locationInWindow[0]; - int deltaY = locationOnScreen[1] - locationInWindow[1]; - mTransitionView.setX(mTransitionView.getX() - deltaX); - mTransitionView.setY(mTransitionView.getY() - deltaY); startActivity(intent, ActivityOptions.makeSceneTransitionAnimation(this, mTransitionView, ChooserActivity.FIRST_IMAGE_PREVIEW_TRANSITION_NAME).toBundle()); diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java index cab2168d44e4d..a528da8bca68c 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java +++ b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java @@ -936,12 +936,10 @@ public class ScreenshotController { */ private Supplier getActionTransitionSupplier() { return () -> { - View preview = mScreenshotView.getTransitionView(); - preview.setX(preview.getX() - mScreenshotView.getStaticLeftMargin()); Pair transition = ActivityOptions.startSharedElementAnimation( mWindow, new ScreenshotExitTransitionCallbacksSupplier(true).get(), - null, Pair.create(mScreenshotView.getTransitionView(), + null, Pair.create(mScreenshotView.getScreenshotPreview(), ChooserActivity.FIRST_IMAGE_PREVIEW_TRANSITION_NAME)); transition.second.startExit(); diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotView.java b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotView.java index e5e690bcb8b03..849b2716cc5a5 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotView.java +++ b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotView.java @@ -137,13 +137,11 @@ public class ScreenshotView extends FrameLayout implements private int mNavMode; private boolean mOrientationPortrait; private boolean mDirectionLTR; - private int mStaticLeftMargin; private ScreenshotSelectorView mScreenshotSelectorView; private ImageView mScrollingScrim; private View mScreenshotStatic; private ImageView mScreenshotPreview; - private View mTransitionView; private View mScreenshotPreviewBorder; private ImageView mScrollablePreview; private ImageView mScreenshotFlash; @@ -341,7 +339,6 @@ public class ScreenshotView extends FrameLayout implements mScrollingScrim = requireNonNull(findViewById(R.id.screenshot_scrolling_scrim)); mScreenshotStatic = requireNonNull(findViewById(R.id.global_screenshot_static)); mScreenshotPreview = requireNonNull(findViewById(R.id.global_screenshot_preview)); - mTransitionView = requireNonNull(findViewById(R.id.screenshot_transition_view)); mScreenshotPreviewBorder = requireNonNull( findViewById(R.id.global_screenshot_preview_border)); mScreenshotPreview.setClipToOutline(true); @@ -387,12 +384,8 @@ public class ScreenshotView extends FrameLayout implements requestFocus(); } - View getTransitionView() { - return mTransitionView; - } - - int getStaticLeftMargin() { - return mStaticLeftMargin; + View getScreenshotPreview() { + return mScreenshotPreview; } /** @@ -433,7 +426,6 @@ public class ScreenshotView extends FrameLayout implements Math.max(cutout.getSafeInsetRight(), waterfall.right), waterfall.bottom); } } - mStaticLeftMargin = p.leftMargin; mScreenshotStatic.setLayoutParams(p); mScreenshotStatic.requestLayout(); }