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

Commit 31350461 authored by Matt Casey's avatar Matt Casey Committed by Automerger Merge Worker
Browse files

Merge "Fix screenshot to corner animation" into sc-dev am: 01ce414d 

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

Change-Id: I520481a762d56f42403ebbdeefde73a35590cf43
parents 202cfde2 01ce414d

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

+14 −15
Original line number Diff line number Diff line
@@ -453,14 +453,6 @@ public class ScreenshotView extends FrameLayout implements 
                mCornerSizeX / (mOrientationPortrait ? bounds.width() : bounds.height());

        final float currentScale = 1 / cornerScale;



        mScreenshotPreview.setScaleX(currentScale);

        mScreenshotPreview.setScaleY(currentScale);



        if (mAccessibilityManager.isEnabled()) {

            mDismissButton.setAlpha(0);

            mDismissButton.setVisibility(View.VISIBLE);

        }



        AnimatorSet dropInAnimation = new AnimatorSet();

        ValueAnimator flashInAnimator = ValueAnimator.ofFloat(0, 1);

        flashInAnimator.setDuration(SCREENSHOT_FLASH_IN_DURATION_MS);
@@ -491,6 +483,20 @@ public class ScreenshotView extends FrameLayout implements 


        ValueAnimator toCorner = ValueAnimator.ofFloat(0, 1);

        toCorner.setDuration(SCREENSHOT_TO_CORNER_Y_DURATION_MS);



        toCorner.addListener(new AnimatorListenerAdapter() {

            @Override

            public void onAnimationStart(Animator animation) {

                mScreenshotPreview.setScaleX(currentScale);

                mScreenshotPreview.setScaleY(currentScale);

                mScreenshotPreview.setVisibility(View.VISIBLE);

                if (mAccessibilityManager.isEnabled()) {

                    mDismissButton.setAlpha(0);

                    mDismissButton.setVisibility(View.VISIBLE);

                }

            }

        });



        float xPositionPct =

                SCREENSHOT_TO_CORNER_X_DURATION_MS / (float) SCREENSHOT_TO_CORNER_Y_DURATION_MS;

        float dismissPct =
@@ -534,13 +540,6 @@ public class ScreenshotView extends FrameLayout implements 
            }

        });



        toCorner.addListener(new AnimatorListenerAdapter() {

            @Override

            public void onAnimationStart(Animator animation) {

                mScreenshotPreview.setVisibility(View.VISIBLE);

            }

        });



        mScreenshotFlash.setAlpha(0f);

        mScreenshotFlash.setVisibility(View.VISIBLE);