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

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

Change-Id: I3a1830cfffdd939285e603bdea39e7454165e443
This commit is contained in:
Ming-Shin Lu 2021-09-24 08:54:38 +00:00 committed by Automerger Merge Worker
commit e730ad6ec7

View File

@ -16,6 +16,7 @@
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.alpha;
import static android.os.Trace.TRACE_TAG_WINDOW_MANAGER;
@ -314,6 +315,12 @@ public class TaskSnapshotWindow {
}
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) {
mSplashScreenExecutor.removeCallbacks(mScheduledRunnable);
mScheduledRunnable = null;