Merge "Using fast-invalidate pattern for screenshot animations." into ics-mr1 (650ee281) · Commits · e / os / android_frameworks_base

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

+36 −22

Original line number	Original line	Diff line number	Diff line
	@@ -462,16 +462,20 @@ class GlobalScreenshot {
	anim.addListener(new AnimatorListenerAdapter() {		anim.addListener(new AnimatorListenerAdapter() {
	@Override		@Override
	public void onAnimationStart(Animator animation) {		public void onAnimationStart(Animator animation) {
	mBackgroundView.setAlpha(0f);		mBackgroundView.setFastAlpha(0f);
	mBackgroundView.setVisibility(View.VISIBLE);		mBackgroundView.setVisibility(View.VISIBLE);
	mScreenshotContainerView.setAlpha(0f);		mBackgroundView.fastInvalidate();
	mScreenshotContainerView.setTranslationX(0f);		mScreenshotContainerView.setFastAlpha(0f);
	mScreenshotContainerView.setTranslationY(0f);		mScreenshotContainerView.setFastTranslationX(0f);
	mScreenshotContainerView.setScaleX(SCREENSHOT_SCALE + mBgPaddingScale);		mScreenshotContainerView.setFastTranslationY(0f);
	mScreenshotContainerView.setScaleY(SCREENSHOT_SCALE + mBgPaddingScale);		mScreenshotContainerView.setFastScaleX(SCREENSHOT_SCALE + mBgPaddingScale);
			mScreenshotContainerView.setFastScaleY(SCREENSHOT_SCALE + mBgPaddingScale);
	mScreenshotContainerView.setVisibility(View.VISIBLE);		mScreenshotContainerView.setVisibility(View.VISIBLE);
	mScreenshotFlash.setAlpha(0f);		mScreenshotContainerView.fastInvalidate();
			mScreenshotFlash.setFastAlpha(0f);
	mScreenshotFlash.setVisibility(View.VISIBLE);		mScreenshotFlash.setVisibility(View.VISIBLE);
			mScreenshotFlash.fastInvalidate();
			mScreenshotLayout.invalidate();
	}		}
	@Override		@Override
	public void onAnimationEnd(android.animation.Animator animation) {		public void onAnimationEnd(android.animation.Animator animation) {
	@@ -485,11 +489,15 @@ class GlobalScreenshot {
	float scaleT = (SCREENSHOT_SCALE + mBgPaddingScale)		float scaleT = (SCREENSHOT_SCALE + mBgPaddingScale)
	- (float) scaleInterpolator.getInterpolation(t)		- (float) scaleInterpolator.getInterpolation(t)
	* (SCREENSHOT_SCALE - SCREENSHOT_DROP_IN_MIN_SCALE);		* (SCREENSHOT_SCALE - SCREENSHOT_DROP_IN_MIN_SCALE);
	mBackgroundView.setAlpha(scaleInterpolator.getInterpolation(t) * BACKGROUND_ALPHA);		mBackgroundView.setFastAlpha(scaleInterpolator.getInterpolation(t) * BACKGROUND_ALPHA);
	mScreenshotContainerView.setAlpha(t);		mBackgroundView.fastInvalidate();
	mScreenshotContainerView.setScaleX(scaleT);		mScreenshotContainerView.setFastAlpha(t);
	mScreenshotContainerView.setScaleY(scaleT);		mScreenshotContainerView.setFastScaleX(scaleT);
	mScreenshotFlash.setAlpha(flashAlphaInterpolator.getInterpolation(t));		mScreenshotContainerView.setFastScaleY(scaleT);
			mScreenshotContainerView.fastInvalidate();
			mScreenshotFlash.setFastAlpha(flashAlphaInterpolator.getInterpolation(t));
			mScreenshotFlash.fastInvalidate();
			mScreenshotLayout.invalidate();
	}		}
	});		});
	return anim;		return anim;
	@@ -517,10 +525,13 @@ class GlobalScreenshot {
	float scaleT = (SCREENSHOT_DROP_IN_MIN_SCALE + mBgPaddingScale)		float scaleT = (SCREENSHOT_DROP_IN_MIN_SCALE + mBgPaddingScale)
	- (float) t * (SCREENSHOT_DROP_IN_MIN_SCALE		- (float) t * (SCREENSHOT_DROP_IN_MIN_SCALE
	- SCREENSHOT_FAST_DROP_OUT_MIN_SCALE);		- SCREENSHOT_FAST_DROP_OUT_MIN_SCALE);
	mBackgroundView.setAlpha((1f - t) * BACKGROUND_ALPHA);		mBackgroundView.setFastAlpha((1f - t) * BACKGROUND_ALPHA);
	mScreenshotContainerView.setAlpha(1f - t);		mBackgroundView.fastInvalidate();
	mScreenshotContainerView.setScaleX(scaleT);		mScreenshotContainerView.setFastAlpha(1f - t);
	mScreenshotContainerView.setScaleY(scaleT);		mScreenshotContainerView.setFastScaleX(scaleT);
			mScreenshotContainerView.setFastScaleY(scaleT);
			mScreenshotContainerView.fastInvalidate();
			mScreenshotLayout.invalidate();
	}		}
	});		});
	} else {		} else {
	@@ -555,12 +566,15 @@ class GlobalScreenshot {
	float scaleT = (SCREENSHOT_DROP_IN_MIN_SCALE + mBgPaddingScale)		float scaleT = (SCREENSHOT_DROP_IN_MIN_SCALE + mBgPaddingScale)
	- (float) scaleInterpolator.getInterpolation(t)		- (float) scaleInterpolator.getInterpolation(t)
	* (SCREENSHOT_DROP_IN_MIN_SCALE - SCREENSHOT_DROP_OUT_MIN_SCALE);		* (SCREENSHOT_DROP_IN_MIN_SCALE - SCREENSHOT_DROP_OUT_MIN_SCALE);
	mBackgroundView.setAlpha((1f - t) * BACKGROUND_ALPHA);		mBackgroundView.setFastAlpha((1f - t) * BACKGROUND_ALPHA);
	mScreenshotContainerView.setAlpha(1f - scaleInterpolator.getInterpolation(t));		mBackgroundView.fastInvalidate();
	mScreenshotContainerView.setScaleX(scaleT);		mScreenshotContainerView.setFastAlpha(1f - scaleInterpolator.getInterpolation(t));
	mScreenshotContainerView.setScaleY(scaleT);		mScreenshotContainerView.setFastScaleX(scaleT);
	mScreenshotContainerView.setTranslationX(t * finalPos.x);		mScreenshotContainerView.setFastScaleY(scaleT);
	mScreenshotContainerView.setTranslationY(t * finalPos.y);		mScreenshotContainerView.setFastTranslationX(t * finalPos.x);
			mScreenshotContainerView.setFastTranslationY(t * finalPos.y);
			mScreenshotContainerView.fastInvalidate();
			mScreenshotLayout.invalidate();
	}		}
	});		});
	}		}