openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

resolve merge conflicts of 8786016e85 to rvc-qpr-dev 

Bug: 168802517
Change-Id: I84db4b2328ecdd40991f661f23f635f4dd1a42ab
Merged-In: I3e6ba1d8645335785e8e26cdc895ea9c0017a0fd
This commit is contained in:
Alex Johnston 2021-04-07 17:05:39 +00:00
parent a62e49b365 8786016e85
commit a538ffe2a4
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
quickstep/recents_ui_overrides/src/com/android/quickstep/TaskOverlayFactory.java
View File

@ -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

5
quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskThumbnailView.java
View File

@ -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;
}
/**