Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Modify TaskSnapshotWindow#scheduleRemove" into sc-qpr1-dev am: d820697e08 am: e730ad6ec7

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15896148

Change-Id: I8496266d490a8e0da7ab791cf43148d3ef70d9f9
This commit is contained in:
Ming-Shin Lu
2021-09-24 09:03:39 +00:00
committed by Automerger Merge Worker
parent 714f929f92 e730ad6ec7
commit ed485b7006
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/TaskSnapshotWindow.java
View File

@@ -16,6 +16,7 @@
package com.android.wm.shell.startingsurface; package com.android.wm.shell.startingsurface;
import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME;
import static android.graphics.Color.WHITE; import static android.graphics.Color.WHITE;
import static android.graphics.Color.alpha; import static android.graphics.Color.alpha;
import static android.os.Trace.TRACE_TAG_WINDOW_MANAGER; import static android.os.Trace.TRACE_TAG_WINDOW_MANAGER;
@@ -314,6 +315,12 @@ public class TaskSnapshotWindow {
} }
void scheduleRemove(Runnable onRemove) { void scheduleRemove(Runnable onRemove) {
// Show the latest content as soon as possible for unlocking to home.
if (mActivityType == ACTIVITY_TYPE_HOME) {
removeImmediately();
onRemove.run();
return;
}
if (mScheduledRunnable != null) { if (mScheduledRunnable != null) {
mSplashScreenExecutor.removeCallbacks(mScheduledRunnable); mSplashScreenExecutor.removeCallbacks(mScheduledRunnable);
mScheduledRunnable = null; mScheduledRunnable = null;