Merge "Fork GlobalScreenshot into notif vs corner flows" (5848fb8f) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/layout/global_screenshot.xml

+1 −1

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2011 The Android Open Source Project
		<!-- Copyright (C) 2020 The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.

packages/SystemUI/res/layout/global_screenshot_legacy.xml

0 → 100644

+42 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2011 The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		You may obtain a copy of the License at

		http://www.apache.org/licenses/LICENSE-2.0

		Unless required by applicable law or agreed to in writing, software
		distributed under the License is distributed on an "AS IS" BASIS,
		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		See the License for the specific language governing permissions and
		limitations under the License.
		-->
		<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="match_parent">
		<ImageView android:id="@+id/global_screenshot_legacy_background"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:src="@android:color/black"
		android:visibility="gone" />
		<ImageView android:id="@+id/global_screenshot_legacy"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center"
		android:background="@drawable/screenshot_panel"
		android:visibility="gone"
		android:adjustViewBounds="true" />
		<ImageView android:id="@+id/global_screenshot_legacy_flash"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:src="@android:color/white"
		android:visibility="gone" />
		<com.android.systemui.screenshot.ScreenshotSelectorView
		android:id="@+id/global_screenshot_legacy_selector"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:visibility="gone"
		android:pointerIcon="crosshair"/>
		</FrameLayout>

packages/SystemUI/res/values/dimens.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -288,6 +288,7 @@
		<!-- Dimensions related to screenshots -->

		<!-- The padding on the global screenshot background image -->
		<dimen name="global_screenshot_legacy_bg_padding">20dp</dimen>
		<dimen name="global_screenshot_bg_padding">20dp</dimen>
		<dimen name="screenshot_action_container_corner_radius">10dp</dimen>
		<dimen name="screenshot_action_container_padding">20dp</dimen>

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

+25 −134

Original line number	Diff line number	Diff line
		@@ -16,11 +16,9 @@

		package com.android.systemui.screenshot;

		import static android.provider.DeviceConfig.NAMESPACE_SYSTEMUI;
		import static android.view.View.VISIBLE;
		import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;

		import static com.android.internal.config.sysui.SystemUiDeviceConfigFlags.SCREENSHOT_CORNER_FLOW;
		import static com.android.systemui.statusbar.phone.StatusBar.SYSTEM_DIALOG_REASON_SCREENSHOT;

		import android.animation.Animator;
		@@ -50,7 +48,6 @@ import android.os.Looper;
		import android.os.Message;
		import android.os.PowerManager;
		import android.os.UserHandle;
		import android.provider.DeviceConfig;
		import android.util.DisplayMetrics;
		import android.util.Log;
		import android.util.Slog;
		@@ -246,20 +243,13 @@ public class GlobalScreenshot {
		mSaveInBgTask.cancel(false);
		}

		if (!DeviceConfig.getBoolean(
		NAMESPACE_SYSTEMUI, SCREENSHOT_CORNER_FLOW, false)) {
		mNotificationsController.reset();
		mNotificationsController.setImage(mScreenBitmap);
		mNotificationsController.showSavingScreenshotNotification();
		}
		mSaveInBgTask = new SaveImageInBackgroundTask(mContext, data).execute();
		}

		/**
		* Takes a screenshot of the current display and shows an animation.
		*/
		private void takeScreenshot(Consumer<Uri> finisher, boolean statusBarVisible,
		boolean navBarVisible, Rect crop) {
		private void takeScreenshot(Consumer<Uri> finisher, Rect crop) {
		int rot = mDisplay.getRotation();
		int width = crop.width();
		int height = crop.height();
		@@ -278,21 +268,20 @@ public class GlobalScreenshot {
		mScreenBitmap.prepareToDraw();

		// Start the post-screenshot animation
		startAnimation(finisher, mDisplayMetrics.widthPixels, mDisplayMetrics.heightPixels,
		statusBarVisible, navBarVisible);
		startAnimation(finisher, mDisplayMetrics.widthPixels, mDisplayMetrics.heightPixels);
		}

		void takeScreenshot(Consumer<Uri> finisher, boolean statusBarVisible, boolean navBarVisible) {
		void takeScreenshot(Consumer<Uri> finisher) {
		mDisplay.getRealMetrics(mDisplayMetrics);
		takeScreenshot(finisher, statusBarVisible, navBarVisible,
		takeScreenshot(
		finisher,
		new Rect(0, 0, mDisplayMetrics.widthPixels, mDisplayMetrics.heightPixels));
		}

		/**
		* Displays a screenshot selector
		*/
		void takeScreenshotPartial(final Consumer<Uri> finisher, final boolean statusBarVisible,
		final boolean navBarVisible) {
		void takeScreenshotPartial(final Consumer<Uri> finisher) {
		mWindowManager.addView(mScreenshotLayout, mWindowLayoutParams);
		mScreenshotSelectorView.setOnTouchListener(new View.OnTouchListener() {
		@Override
		@@ -312,8 +301,7 @@ public class GlobalScreenshot {
		if (rect != null) {
		if (rect.width() != 0 && rect.height() != 0) {
		// Need mScreenshotLayout to handle it after the view disappears
		mScreenshotLayout.post(() -> takeScreenshot(
		finisher, statusBarVisible, navBarVisible, rect));
		mScreenshotLayout.post(() -> takeScreenshot(finisher, rect));
		}
		}

		@@ -364,8 +352,7 @@ public class GlobalScreenshot {
		/**
		* Starts the animation after taking the screenshot
		*/
		private void startAnimation(final Consumer<Uri> finisher, int w, int h,
		boolean statusBarVisible, boolean navBarVisible) {
		private void startAnimation(final Consumer<Uri> finisher, int w, int h) {
		// If power save is on, show a toast so there is some visual indication that a screenshot
		// has been taken.
		PowerManager powerManager = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);
		@@ -385,34 +372,15 @@ public class GlobalScreenshot {
		mScreenshotAnimation.removeAllListeners();
		}

		boolean useCornerFlow =
		DeviceConfig.getBoolean(NAMESPACE_SYSTEMUI, SCREENSHOT_CORNER_FLOW, false);
		mWindowManager.addView(mScreenshotLayout, mWindowLayoutParams);
		ValueAnimator screenshotDropInAnim = createScreenshotDropInAnimation();
		ValueAnimator screenshotFadeOutAnim = useCornerFlow
		? createScreenshotToCornerAnimation(w, h)
		: createScreenshotDropOutAnimation(w, h, statusBarVisible, navBarVisible);
		ValueAnimator screenshotFadeOutAnim = 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
		if (!useCornerFlow) {
		saveScreenshotInWorkerThread(finisher, new ActionsReadyListener() {
		@Override
		void onActionsReady(Uri uri, List<Notification.Action> actions) {
		if (uri == null) {
		mNotificationsController.notifyScreenshotError(
		R.string.screenshot_failed_to_capture_text);
		} else {
		mNotificationsController
		.showScreenshotActionsNotification(uri, actions);
		}
		}
		});
		clearScreenshot();
		} else {
		saveScreenshotInWorkerThread(finisher, new ActionsReadyListener() {
		@Override
		void onActionsReady(Uri uri, List<Notification.Action> actions) {
		@@ -429,7 +397,6 @@ public class GlobalScreenshot {
		mScreenshotHandler.obtainMessage(MESSAGE_CORNER_TIMEOUT),
		SCREENSHOT_CORNER_TIMEOUT_MILLIS);
		}
		}
		});
		mScreenshotHandler.post(() -> {
		// Play the shutter sound to notify that we've taken a screenshot
		@@ -492,7 +459,7 @@ public class GlobalScreenshot {
		}

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

		private ValueAnimator createScreenshotDropOutAnimation(int w, int h, boolean statusBarVisible,
		boolean navBarVisible) {
		ValueAnimator anim = ValueAnimator.ofFloat(0f, 1f);
		anim.setStartDelay(SCREENSHOT_DROP_OUT_DELAY);
		anim.addListener(new AnimatorListenerAdapter() {
		@Override
		public void onAnimationEnd(Animator animation) {
		mBackgroundView.setVisibility(View.GONE);
		mScreenshotView.setVisibility(View.GONE);
		mScreenshotView.setLayerType(View.LAYER_TYPE_NONE, null);
		}
		});

		if (!statusBarVisible \|\| !navBarVisible) {
		// There is no status bar/nav bar, so just fade the screenshot away in place
		anim.setDuration(SCREENSHOT_FAST_DROP_OUT_DURATION);
		anim.addUpdateListener(new AnimatorUpdateListener() {
		@Override
		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);
		mBackgroundView.setAlpha((1f - t) * BACKGROUND_ALPHA);
		mScreenshotView.setAlpha(1f - t);
		mScreenshotView.setScaleX(scaleT);
		mScreenshotView.setScaleY(scaleT);
		}
		});
		} else {
		// In the case where there is a status bar, animate to the origin of the bar (top-left)
		final float scaleDurationPct = (float) SCREENSHOT_DROP_OUT_SCALE_DURATION
		/ SCREENSHOT_DROP_OUT_DURATION;
		final Interpolator scaleInterpolator = new Interpolator() {
		@Override
		public float getInterpolation(float x) {
		if (x < scaleDurationPct) {
		// Decelerate, and scale the input accordingly
		return (float) (1f - Math.pow(1f - (x / scaleDurationPct), 2f));
		}
		return 1f;
		}
		};

		// Determine the bounds of how to scale
		float halfScreenWidth = (w - 2f * mBgPadding) / 2f;
		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);

		// Animate the screenshot to the status bar
		anim.setDuration(SCREENSHOT_DROP_OUT_DURATION);
		anim.addUpdateListener(new AnimatorUpdateListener() {
		@Override
		public void onAnimationUpdate(ValueAnimator animation) {
		float t = (Float) animation.getAnimatedValue();
		float scaleT = (SCREENSHOT_DROP_IN_MIN_SCALE + mBgPaddingScale)
		- scaleInterpolator.getInterpolation(t)
		* (SCREENSHOT_DROP_IN_MIN_SCALE - SCREENSHOT_DROP_OUT_MIN_SCALE);
		mBackgroundView.setAlpha((1f - t) * BACKGROUND_ALPHA);
		mScreenshotView.setAlpha(1f - scaleInterpolator.getInterpolation(t));
		mScreenshotView.setScaleX(scaleT);
		mScreenshotView.setScaleY(scaleT);
		mScreenshotView.setTranslationX(t * finalPos.x);
		mScreenshotView.setTranslationY(t * finalPos.y);
		}
		});
		}
		return anim;
		}

		private ValueAnimator createScreenshotToCornerAnimation(int w, int h) {
		ValueAnimator anim = ValueAnimator.ofFloat(0f, 1f);
		anim.setStartDelay(SCREENSHOT_DROP_OUT_DELAY);
		@@ -776,8 +668,7 @@ public class GlobalScreenshot {
		String actionType = intent.getStringExtra(EXTRA_ACTION_TYPE);
		Slog.d(TAG, "Executing smart action [" + actionType + "]:" + actionIntent);
		ActivityOptions opts = ActivityOptions.makeBasic();
		context.startActivityAsUser(actionIntent, opts.toBundle(),
		UserHandle.CURRENT);
		context.startActivityAsUser(actionIntent, opts.toBundle(), UserHandle.CURRENT);

		ScreenshotSmartActions.notifyScreenshotAction(
		context, intent.getStringExtra(EXTRA_ID), actionType, true);

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

0 → 100644

+508 −0

File added.

Preview size limit exceeded, changes collapsed.