Merge "Fix screenshot to corner animation" into sc-dev (01ce414d) · Commits · e / os / android_frameworks_base

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);