| commit | 18217e7f94b221907a9454510d95ec2c0ca114d8 | [log] [tgz] |
|---|---|---|
| author | Alex Johnston <acjohnston@google.com> | Wed Apr 07 17:00:40 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Apr 07 17:00:40 2021 +0000 |
| tree | d555276eb179d60a70316a55392a4ee3fffa7885 | |
| parent | 602da1840d5ccc3414734b7c2d335ba876433efd [diff] | |
| parent | 8786016e859c639de1d3722c1911b5389ef8fc39 [diff] |
Block recent work profile apps content capture am: 8786016e85 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/13989187 Change-Id: I0e39d019e358dd8e0016927a9c9b50717cf6eb93
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskOverlayFactory.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskOverlayFactory.java index e9614d1..1eaacd3 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskOverlayFactory.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskOverlayFactory.java
@@ -146,7 +146,7 @@ */ public void initOverlay(Task task, ThumbnailData thumbnail, Matrix matrix, boolean rotated) { - final boolean isAllowedByPolicy = thumbnail.isRealSnapshot; + final boolean isAllowedByPolicy = mThumbnailView.isRealSnapshot(); getActionsView().updateDisabledFlags(DISABLED_ROTATED, rotated);
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskThumbnailView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskThumbnailView.java index b2f937f..dbea80a 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskThumbnailView.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskThumbnailView.java
@@ -447,13 +447,14 @@ } /** - * 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; } /**