Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed485b70 authored by Ming-Shin Lu's avatar Ming-Shin Lu Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I8496266d490a8e0da7ab791cf43148d3ef70d9f9
parents 714f929f e730ad6e

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

+7 −0
Original line number Diff line number Diff line
@@ -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;