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

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

+39 −28

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

		void clearContext() {
		context = null;
		}
		@@ -338,7 +339,8 @@ class SaveImageInBackgroundTask extends AsyncTask<Void, Void, Void> {
		mPublicNotificationBuilder
		.setContentTitle(r.getString(R.string.screenshot_saved_title))
		.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)
		.setAutoCancel(true)
		.setColor(context.getColor(
		@@ -346,7 +348,8 @@ class SaveImageInBackgroundTask extends AsyncTask<Void, Void, Void> {
		mNotificationBuilder
		.setContentTitle(r.getString(R.string.screenshot_saved_title))
		.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)
		.setAutoCancel(true)
		.setColor(context.getColor(
		@@ -454,7 +457,8 @@ class GlobalScreenshot {
		// Inflate the screenshot layout
		mDisplayMatrix = new Matrix();
		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);
		mScreenshotFlash = (ImageView) mScreenshotLayout.findViewById(R.id.global_screenshot_flash);
		mScreenshotSelectorView = (ScreenshotSelectorView) mScreenshotLayout.findViewById(
		@@ -483,6 +487,7 @@ class GlobalScreenshot {
		mWindowManager = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
		mNotificationManager =
		(NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);

		mDisplay = mWindowManager.getDefaultDisplay();
		mDisplayMetrics = new DisplayMetrics();
		mDisplay.getRealMetrics(mDisplayMetrics);
		@@ -719,6 +724,7 @@ class GlobalScreenshot {
		}
		});
		}

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

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

		private ValueAnimator createScreenshotDropOutAnimation(int w, int h, boolean statusBarVisible,
		boolean navBarVisible) {
		ValueAnimator anim = ValueAnimator.ofFloat(0f, 1f);
		@@ -801,7 +809,8 @@ class GlobalScreenshot {
		public void onAnimationUpdate(ValueAnimator animation) {
		float t = (Float) animation.getAnimatedValue();
		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);
		mScreenshotView.setAlpha(1f - t);
		mScreenshotView.setScaleX(scaleT);
		@@ -828,8 +837,10 @@ class GlobalScreenshot {
		float halfScreenHeight = (h - 2f * mBgPadding) / 2f;
		final float offsetPct = SCREENSHOT_DROP_OUT_MIN_SCALE_OFFSET;
		final PointF finalPos = new PointF(
		-halfScreenWidth + (SCREENSHOT_DROP_OUT_MIN_SCALE + offsetPct) * halfScreenWidth,
		-halfScreenHeight + (SCREENSHOT_DROP_OUT_MIN_SCALE + offsetPct) * halfScreenHeight);
		-halfScreenWidth
		+ (SCREENSHOT_DROP_OUT_MIN_SCALE + offsetPct) * halfScreenWidth,
		-halfScreenHeight
		+ (SCREENSHOT_DROP_OUT_MIN_SCALE + offsetPct) * halfScreenHeight);

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