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

Commit 6273c587 authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Automerger Merge Worker
Browse files

Merge "Skip splash screen exit animation if screen isn't on." into tm-dev am:... 

Merge "Skip splash screen exit animation if screen isn't on." into tm-dev am: fe1b41da am: aaf7b569

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



Change-Id: Ieea5f8af7fc9692ee1a314fa5f19d3669a40f5fb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9f73de85 aaf7b569

services/core/java/com/android/server/wm/TaskOrganizerController.java

+4 −3
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import android.os.Parcel; 
import android.os.RemoteException;

import android.util.Slog;

import android.util.proto.ProtoOutputStream;

import android.view.Display;

import android.view.SurfaceControl;

import android.window.ITaskOrganizer;

import android.window.ITaskOrganizerController;
@@ -526,17 +527,17 @@ class TaskOrganizerController extends ITaskOrganizerController.Stub { 
        }

        final StartingWindowRemovalInfo removalInfo = new StartingWindowRemovalInfo();

        removalInfo.taskId = task.mTaskId;

        removalInfo.playRevealAnimation = prepareAnimation;

        removalInfo.playRevealAnimation = prepareAnimation

                && task.getDisplayInfo().state == Display.STATE_ON;

        final boolean playShiftUpAnimation = !task.inMultiWindowMode();

        final ActivityRecord topActivity = task.topActivityContainsStartingWindow();

        if (topActivity != null) {

            removalInfo.deferRemoveForIme = topActivity.mDisplayContent

                    .mayImeShowOnLaunchingActivity(topActivity);

            if (prepareAnimation && playShiftUpAnimation) {

            if (removalInfo.playRevealAnimation && playShiftUpAnimation) {

                final WindowState mainWindow =

                        topActivity.findMainWindow(false/* includeStartingApp */);

                if (mainWindow != null) {

                    final SurfaceControl.Transaction t = mainWindow.getPendingTransaction();

                    removalInfo.windowAnimationLeash = applyStartingWindowAnimation(mainWindow);

                    removalInfo.mainFrame = mainWindow.getRelativeFrame();

                }