Merge "Start saving screenshot in background earlier" (99808158) · Commits · e / os / android_frameworks_base

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

+25 −17

Original line number	Diff line number	Diff line
		@@ -442,13 +442,10 @@ public class GlobalScreenshot implements ViewTreeObserver.OnComputeInternalInset

		ValueAnimator screenshotDropInAnim = screenRect != null ? createRectAnimation(screenRect)
		: createScreenshotDropInAnimation();
		ValueAnimator screenshotFadeOutAnim = createScreenshotToCornerAnimation(w, h);
		ValueAnimator screenshotToCornerAnimation = createScreenshotToCornerAnimation(w, h);
		mScreenshotAnimation = new AnimatorSet();
		mScreenshotAnimation.playSequentially(screenshotDropInAnim, screenshotFadeOutAnim);
		mScreenshotAnimation.addListener(new AnimatorListenerAdapter() {
		@Override
		public void onAnimationEnd(Animator animation) {
		// Save the screenshot once we have a bit of time now
		mScreenshotAnimation.playSequentially(screenshotDropInAnim, screenshotToCornerAnimation);

		saveScreenshotInWorkerThread(finisher, new ActionsReadyListener() {
		@Override
		void onActionsReady(Uri uri, List<Notification.Action> smartActions,
		@@ -457,12 +454,23 @@ public class GlobalScreenshot implements ViewTreeObserver.OnComputeInternalInset
		mNotificationsController.notifyScreenshotError(
		R.string.screenshot_failed_to_capture_text);
		} else {
		mScreenshotHandler.post(() ->
		createScreenshotActionsShadeAnimation(smartActions,
		actions).start());
		mScreenshotHandler.post(() -> {
		if (mScreenshotAnimation != null && mScreenshotAnimation.isRunning()) {
		mScreenshotAnimation.addListener(
		new AnimatorListenerAdapter() {
		@Override
		public void onAnimationEnd(Animator animation) {
		super.onAnimationEnd(animation);
		createScreenshotActionsShadeAnimation(
		smartActions, actions).start();
		}
		});
		} else {
		createScreenshotActionsShadeAnimation(smartActions,
		actions).start();
		}
		});
		}
		mScreenshotHandler.removeMessages(MESSAGE_CORNER_TIMEOUT);
		mScreenshotHandler.sendMessageDelayed(
		mScreenshotHandler.obtainMessage(MESSAGE_CORNER_TIMEOUT),

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

+0 −5

Original line number	Diff line number	Diff line
		@@ -38,7 +38,6 @@ import android.os.Bundle;
		import android.os.Environment;
		import android.os.Handler;
		import android.os.ParcelFileDescriptor;
		import android.os.Process;
		import android.os.RemoteException;
		import android.os.UserHandle;
		import android.os.UserManager;
		@@ -124,10 +123,6 @@ class SaveImageInBackgroundTask extends AsyncTask<Void, Void, Void> {
		return null;
		}

		// By default, AsyncTask sets the worker thread to have background thread priority,
		// so bump it back up so that we save a little quicker.
		Process.setThreadPriority(Process.THREAD_PRIORITY_FOREGROUND);

		ContentResolver resolver = mContext.getContentResolver();
		Bitmap image = mParams.image;
		Resources r = mContext.getResources();