Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e57570bd authored by Miranda Kephart's avatar Miranda Kephart Committed by Automerger Merge Worker
Browse files

Merge "Revert "Fix shared transition offsets in landscape"" into sc-v2-dev am: 648874c4 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15611766

Change-Id: Icc02f5c2d94cc8426e9aef982a3128c75bd6e619
parents 63850017 648874c4

packages/SystemUI/res/layout/global_screenshot_static.xml

+0 −9
Original line number Original line Diff line number Diff line
@@ -130,13 +130,4 @@ 
        app:layout_constraintStart_toStartOf="@id/global_screenshot_preview"

        app:layout_constraintStart_toStartOf="@id/global_screenshot_preview"

        app:layout_constraintTop_toTopOf="@id/global_screenshot_preview"

        app:layout_constraintTop_toTopOf="@id/global_screenshot_preview"

        android:elevation="@dimen/screenshot_preview_elevation"/>

        android:elevation="@dimen/screenshot_preview_elevation"/>

    <View

        android:id="@+id/screenshot_transition_view"

        android:layout_width="0dp"

        android:layout_height="0dp"

        android:visibility="invisible"

        app:layout_constraintStart_toStartOf="@id/global_screenshot_preview"

        app:layout_constraintTop_toTopOf="@id/global_screenshot_preview"

        app:layout_constraintEnd_toEndOf="@id/global_screenshot_preview"

        app:layout_constraintBottom_toBottomOf="@id/global_screenshot_preview"/>

</androidx.constraintlayout.widget.ConstraintLayout>
 
</androidx.constraintlayout.widget.ConstraintLayout>

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

+1 −8
Original line number Original line Diff line number Diff line
@@ -326,18 +326,11 @@ public class LongScreenshotActivity extends Activity { 
                | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);

                | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);





        mTransitionView.setImageBitmap(mOutputBitmap);

        mTransitionView.setImageBitmap(mOutputBitmap);

        mTransitionView.setVisibility(View.VISIBLE);

        mTransitionView.setTransitionName(

        mTransitionView.setTransitionName(

                ChooserActivity.FIRST_IMAGE_PREVIEW_TRANSITION_NAME);

                ChooserActivity.FIRST_IMAGE_PREVIEW_TRANSITION_NAME);

        // TODO: listen for transition completing instead of finishing onStop

        // TODO: listen for transition completing instead of finishing onStop

        mTransitionStarted = true;

        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,

        startActivity(intent,

                ActivityOptions.makeSceneTransitionAnimation(this, mTransitionView,

                ActivityOptions.makeSceneTransitionAnimation(this, mTransitionView,

                        ChooserActivity.FIRST_IMAGE_PREVIEW_TRANSITION_NAME).toBundle());

                        ChooserActivity.FIRST_IMAGE_PREVIEW_TRANSITION_NAME).toBundle());

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

+1 −3
Original line number Original line Diff line number Diff line
@@ -940,12 +940,10 @@ public class ScreenshotController { 
     */

     */

    private Supplier<ActionTransition> getActionTransitionSupplier() {

    private Supplier<ActionTransition> getActionTransitionSupplier() {

        return () -> {

        return () -> {

            View preview = mScreenshotView.getTransitionView();

            preview.setX(preview.getX() - mScreenshotView.getStaticLeftMargin());

            Pair<ActivityOptions, ExitTransitionCoordinator> transition =

            Pair<ActivityOptions, ExitTransitionCoordinator> transition =

                    ActivityOptions.startSharedElementAnimation(

                    ActivityOptions.startSharedElementAnimation(

                            mWindow, new ScreenshotExitTransitionCallbacksSupplier(true).get(),

                            mWindow, new ScreenshotExitTransitionCallbacksSupplier(true).get(),

                            null, Pair.create(mScreenshotView.getTransitionView(),

                            null, Pair.create(mScreenshotView.getScreenshotPreview(),

                                    ChooserActivity.FIRST_IMAGE_PREVIEW_TRANSITION_NAME));

                                    ChooserActivity.FIRST_IMAGE_PREVIEW_TRANSITION_NAME));

            transition.second.startExit();

            transition.second.startExit();

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

+2 −10
Original line number Original line Diff line number Diff line
@@ -137,13 +137,11 @@ public class ScreenshotView extends FrameLayout implements 
    private int mNavMode;

    private int mNavMode;

    private boolean mOrientationPortrait;

    private boolean mOrientationPortrait;

    private boolean mDirectionLTR;

    private boolean mDirectionLTR;

    private int mStaticLeftMargin;





    private ScreenshotSelectorView mScreenshotSelectorView;

    private ScreenshotSelectorView mScreenshotSelectorView;

    private ImageView mScrollingScrim;

    private ImageView mScrollingScrim;

    private View mScreenshotStatic;

    private View mScreenshotStatic;

    private ImageView mScreenshotPreview;

    private ImageView mScreenshotPreview;

    private View mTransitionView;

    private View mScreenshotPreviewBorder;

    private View mScreenshotPreviewBorder;

    private ImageView mScrollablePreview;

    private ImageView mScrollablePreview;

    private ImageView mScreenshotFlash;

    private ImageView mScreenshotFlash;
@@ -341,7 +339,6 @@ public class ScreenshotView extends FrameLayout implements 
        mScrollingScrim = requireNonNull(findViewById(R.id.screenshot_scrolling_scrim));

        mScrollingScrim = requireNonNull(findViewById(R.id.screenshot_scrolling_scrim));

        mScreenshotStatic = requireNonNull(findViewById(R.id.global_screenshot_static));

        mScreenshotStatic = requireNonNull(findViewById(R.id.global_screenshot_static));

        mScreenshotPreview = requireNonNull(findViewById(R.id.global_screenshot_preview));

        mScreenshotPreview = requireNonNull(findViewById(R.id.global_screenshot_preview));

        mTransitionView = requireNonNull(findViewById(R.id.screenshot_transition_view));

        mScreenshotPreviewBorder = requireNonNull(

        mScreenshotPreviewBorder = requireNonNull(

                findViewById(R.id.global_screenshot_preview_border));

                findViewById(R.id.global_screenshot_preview_border));

        mScreenshotPreview.setClipToOutline(true);

        mScreenshotPreview.setClipToOutline(true);
@@ -387,12 +384,8 @@ public class ScreenshotView extends FrameLayout implements 
        requestFocus();

        requestFocus();

    }

    }





    View getTransitionView() {

    View getScreenshotPreview() {

        return mTransitionView;

        return mScreenshotPreview;

    }



    int getStaticLeftMargin() {

        return mStaticLeftMargin;

    }

    }





    /**

    /**
@@ -442,7 +435,6 @@ public class ScreenshotView extends FrameLayout implements 
                        Math.max(navBarInsets.bottom, waterfall.bottom));

                        Math.max(navBarInsets.bottom, waterfall.bottom));

            }

            }

        }

        }

        mStaticLeftMargin = p.leftMargin;

        mScreenshotStatic.setLayoutParams(p);

        mScreenshotStatic.setLayoutParams(p);

        mScreenshotStatic.requestLayout();

        mScreenshotStatic.requestLayout();

    }

    }