Merge "[DO NOT MERGE] Make GlobalScreenshot PendingIntents immutable" into qt-dev (b968a16d) · Commits · e / os / android_frameworks_base

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

+48 −38

Original line number	Original line	Diff line number	Diff line
	@@ -116,6 +116,7 @@ class SaveImageInBackgroundData {
	imageUri = null;		imageUri = null;
	iconSize = 0;		iconSize = 0;
	}		}

	void clearContext() {		void clearContext() {
	context = null;		context = null;
	}		}
	@@ -387,7 +388,8 @@ class SaveImageInBackgroundTask extends AsyncTask<Void, Void, Void> {
	mPublicNotificationBuilder		mPublicNotificationBuilder
	.setContentTitle(r.getString(R.string.screenshot_saved_title))		.setContentTitle(r.getString(R.string.screenshot_saved_title))
	.setContentText(r.getString(R.string.screenshot_saved_text))		.setContentText(r.getString(R.string.screenshot_saved_text))
	.setContentIntent(PendingIntent.getActivity(mParams.context, 0, launchIntent, 0))		.setContentIntent(PendingIntent.getActivity(mParams.context, 0, launchIntent,
			PendingIntent.FLAG_IMMUTABLE))
	.setWhen(now)		.setWhen(now)
	.setAutoCancel(true)		.setAutoCancel(true)
	.setColor(context.getColor(		.setColor(context.getColor(
	@@ -395,7 +397,8 @@ class SaveImageInBackgroundTask extends AsyncTask<Void, Void, Void> {
	mNotificationBuilder		mNotificationBuilder
	.setContentTitle(r.getString(R.string.screenshot_saved_title))		.setContentTitle(r.getString(R.string.screenshot_saved_title))
	.setContentText(r.getString(R.string.screenshot_saved_text))		.setContentText(r.getString(R.string.screenshot_saved_text))
	.setContentIntent(PendingIntent.getActivity(mParams.context, 0, launchIntent, 0))		.setContentIntent(PendingIntent.getActivity(mParams.context, 0, launchIntent,
			PendingIntent.FLAG_IMMUTABLE))
	.setWhen(now)		.setWhen(now)
	.setAutoCancel(true)		.setAutoCancel(true)
	.setColor(context.getColor(		.setColor(context.getColor(
	@@ -504,7 +507,8 @@ class GlobalScreenshot {

	// Inflate the screenshot layout		// Inflate the screenshot layout
	mScreenshotLayout = layoutInflater.inflate(R.layout.global_screenshot, null);		mScreenshotLayout = layoutInflater.inflate(R.layout.global_screenshot, null);
	mBackgroundView = (ImageView) mScreenshotLayout.findViewById(R.id.global_screenshot_background);		mBackgroundView = (ImageView) mScreenshotLayout.findViewById(
			R.id.global_screenshot_background);
	mScreenshotView = (ImageView) mScreenshotLayout.findViewById(R.id.global_screenshot);		mScreenshotView = (ImageView) mScreenshotLayout.findViewById(R.id.global_screenshot);
	mScreenshotFlash = (ImageView) mScreenshotLayout.findViewById(R.id.global_screenshot_flash);		mScreenshotFlash = (ImageView) mScreenshotLayout.findViewById(R.id.global_screenshot_flash);
	mScreenshotSelectorView = (ScreenshotSelectorView) mScreenshotLayout.findViewById(		mScreenshotSelectorView = (ScreenshotSelectorView) mScreenshotLayout.findViewById(
	@@ -728,6 +732,7 @@ class GlobalScreenshot {
	}		}
	});		});
	}		}

	private ValueAnimator createScreenshotDropInAnimation() {		private ValueAnimator createScreenshotDropInAnimation() {
	final float flashPeakDurationPct = ((float) (SCREENSHOT_FLASH_TO_PEAK_DURATION)		final float flashPeakDurationPct = ((float) (SCREENSHOT_FLASH_TO_PEAK_DURATION)
	/ SCREENSHOT_DROP_IN_DURATION);		/ SCREENSHOT_DROP_IN_DURATION);
	@@ -777,6 +782,7 @@ class GlobalScreenshot {
	mScreenshotFlash.setAlpha(0f);		mScreenshotFlash.setAlpha(0f);
	mScreenshotFlash.setVisibility(View.VISIBLE);		mScreenshotFlash.setVisibility(View.VISIBLE);
	}		}

	@Override		@Override
	public void onAnimationEnd(android.animation.Animator animation) {		public void onAnimationEnd(android.animation.Animator animation) {
	mScreenshotFlash.setVisibility(View.GONE);		mScreenshotFlash.setVisibility(View.GONE);
	@@ -798,6 +804,7 @@ class GlobalScreenshot {
	});		});
	return anim;		return anim;
	}		}

	private ValueAnimator createScreenshotDropOutAnimation(int w, int h, boolean statusBarVisible,		private ValueAnimator createScreenshotDropOutAnimation(int w, int h, boolean statusBarVisible,
	boolean navBarVisible) {		boolean navBarVisible) {
	ValueAnimator anim = ValueAnimator.ofFloat(0f, 1f);		ValueAnimator anim = ValueAnimator.ofFloat(0f, 1f);
	@@ -819,7 +826,8 @@ class GlobalScreenshot {
	public void onAnimationUpdate(ValueAnimator animation) {		public void onAnimationUpdate(ValueAnimator animation) {
	float t = (Float) animation.getAnimatedValue();		float t = (Float) animation.getAnimatedValue();
	float scaleT = (SCREENSHOT_DROP_IN_MIN_SCALE + mBgPaddingScale)		float scaleT = (SCREENSHOT_DROP_IN_MIN_SCALE + mBgPaddingScale)
	- t * (SCREENSHOT_DROP_IN_MIN_SCALE - SCREENSHOT_FAST_DROP_OUT_MIN_SCALE);		- t * (SCREENSHOT_DROP_IN_MIN_SCALE
			- SCREENSHOT_FAST_DROP_OUT_MIN_SCALE);
	mBackgroundView.setAlpha((1f - t) * BACKGROUND_ALPHA);		mBackgroundView.setAlpha((1f - t) * BACKGROUND_ALPHA);
	mScreenshotView.setAlpha(1f - t);		mScreenshotView.setAlpha(1f - t);
	mScreenshotView.setScaleX(scaleT);		mScreenshotView.setScaleX(scaleT);
	@@ -846,8 +854,10 @@ class GlobalScreenshot {
	float halfScreenHeight = (h - 2f * mBgPadding) / 2f;		float halfScreenHeight = (h - 2f * mBgPadding) / 2f;
	final float offsetPct = SCREENSHOT_DROP_OUT_MIN_SCALE_OFFSET;		final float offsetPct = SCREENSHOT_DROP_OUT_MIN_SCALE_OFFSET;
	final PointF finalPos = new PointF(		final PointF finalPos = new PointF(
	-halfScreenWidth + (SCREENSHOT_DROP_OUT_MIN_SCALE + offsetPct) * halfScreenWidth,		-halfScreenWidth
	-halfScreenHeight + (SCREENSHOT_DROP_OUT_MIN_SCALE + offsetPct) * halfScreenHeight);		+ (SCREENSHOT_DROP_OUT_MIN_SCALE + offsetPct) * halfScreenWidth,
			-halfScreenHeight
			+ (SCREENSHOT_DROP_OUT_MIN_SCALE + offsetPct) * halfScreenHeight);

	// Animate the screenshot to the status bar		// Animate the screenshot to the status bar
	anim.setDuration(SCREENSHOT_DROP_OUT_DURATION);		anim.setDuration(SCREENSHOT_DROP_OUT_DURATION);
	@@ -892,7 +902,7 @@ class GlobalScreenshot {
	DevicePolicyManager.POLICY_DISABLE_SCREEN_CAPTURE);		DevicePolicyManager.POLICY_DISABLE_SCREEN_CAPTURE);
	if (intent != null) {		if (intent != null) {
	final PendingIntent pendingIntent = PendingIntent.getActivityAsUser(		final PendingIntent pendingIntent = PendingIntent.getActivityAsUser(
	context, 0, intent, 0, null, UserHandle.CURRENT);		context, 0, intent, PendingIntent.FLAG_IMMUTABLE, null, UserHandle.CURRENT);
	b.setContentIntent(pendingIntent);		b.setContentIntent(pendingIntent);
	}		}