diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-08 22:05:42 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-08 22:05:42 +0000 |
commit | 2121a1b209985708f877290c8d9bb25abcd14fe6 (patch) | |
tree | 71351f062014fe75181779065aac044db252e263 | |
parent | 593f4389d10daee68e1818324743db8802008420 (diff) | |
parent | a538ffe2a4b94aa9ddbed4cecc8d2d1d52663bfe (diff) | |
download | Launcher3-2121a1b209985708f877290c8d9bb25abcd14fe6.tar.gz |
Snap for 7269201 from a538ffe2a4b94aa9ddbed4cecc8d2d1d52663bfe to rvc-qpr3-releaseandroid-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android11-qpr3-s1-release
Change-Id: If859efaaab8aae2518d6e0344ebbeca4335e2213
-rw-r--r-- | quickstep/recents_ui_overrides/src/com/android/quickstep/TaskOverlayFactory.java | 2 | ||||
-rw-r--r-- | quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskThumbnailView.java | 5 |
2 files changed, 4 insertions, 3 deletions
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 36579ec736..a59584787c 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskOverlayFactory.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskOverlayFactory.java @@ -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 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 607672a751..9e97a695ad 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 @@ 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; } /** |