Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5dd7e72e authored Apr 08, 2021 by Alex Johnston Committed by Automerger Merge Worker Apr 08, 2021

resolve merge conflicts of 8786016e to rvc-qpr-dev am: a538ffe2

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14102694

Change-Id: I31f76112edeb770bc3b9c017f6205392dbe3f5a8

parents ee9a99a6 a538ffe2

quickstep/recents_ui_overrides/src/com/android/quickstep/TaskOverlayFactory.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -147,10 +147,10 @@ public class TaskOverlayFactory implements ResourceBasedOverride {
		public void initOverlay(Task task, ThumbnailData thumbnail, Matrix matrix,
		boolean rotated) {
		getActionsView().updateDisabledFlags(DISABLED_NO_THUMBNAIL, thumbnail == null);
		final boolean isAllowedByPolicy = mThumbnailView.isRealSnapshot();

		if (thumbnail != null) {
		getActionsView().updateDisabledFlags(DISABLED_ROTATED, rotated);
		final boolean isAllowedByPolicy = thumbnail.isRealSnapshot;

		getActionsView().setCallbacks(new OverlayUICallbacks() {
		@Override

quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskThumbnailView.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -447,13 +447,14 @@ public class TaskThumbnailView extends View implements PluginListener<OverviewSc
		}

		/**
		* Returns whether the snapshot is real.
		* Returns whether the snapshot is real. If the device is locked for the user of the task,
		* the snapshot used will be an app-theme generated snapshot instead of a real snapshot.
		*/
		public boolean isRealSnapshot() {
		if (mThumbnailData == null) {
		return false;
		}
		return mThumbnailData.isRealSnapshot;
		return mThumbnailData.isRealSnapshot && !mTask.isLocked;
		}

		/**