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

Commit 3024efa8 authored by Chris Li's avatar Chris Li Committed by Automerger Merge Worker
Browse files

Merge "Do not freeze window in WM Core if Shell transition is enabled" into... 

Merge "Do not freeze window in WM Core if Shell transition is enabled" into tm-qpr-dev am: 8129e9da am: ce0a3fb8

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



Change-Id: If806e2239687582225bc09349e2f025b9f04c8f1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f8ea2267 ce0a3fb8

libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java

+8 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ import android.os.Bundle; 
import android.os.Handler;

import android.os.IBinder;

import android.os.Looper;

import android.os.SystemProperties;

import android.util.ArraySet;

import android.util.Log;

import android.util.Pair;
@@ -70,6 +71,8 @@ import java.util.function.Consumer; 
public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmentCallback,

        ActivityEmbeddingComponent {

    static final String TAG = "SplitController";

    static final boolean ENABLE_SHELL_TRANSITIONS =

            SystemProperties.getBoolean("persist.wm.debug.shell_transit", false);



    @VisibleForTesting

    @GuardedBy("mLock")
@@ -332,6 +335,11 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen 
     * bounds is large enough for at least one split rule.

     */

    private void updateAnimationOverride(@NonNull TaskContainer taskContainer) {

        if (ENABLE_SHELL_TRANSITIONS) {

            // TODO(b/207070762): cleanup with legacy app transition

            // Animation will be handled by WM Shell with Shell transition enabled.

            return;

        }

        if (!taskContainer.isTaskBoundsInitialized()

                || !taskContainer.isWindowingModeInitialized()) {

            // We don't know about the Task bounds/windowingMode yet.

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

+4 −0
Original line number Diff line number Diff line
@@ -2818,6 +2818,10 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< 
     *                     snapshot from {@link #getFreezeSnapshotTarget()}.

     */

    void initializeChangeTransition(Rect startBounds, @Nullable SurfaceControl freezeTarget) {

        if (mDisplayContent.mTransitionController.isShellTransitionsEnabled()) {

            // TODO(b/207070762): request shell transition for activityEmbedding change.

            return;

        }

        mDisplayContent.prepareAppTransition(TRANSIT_CHANGE);

        mDisplayContent.mChangingContainers.add(this);

        // Calculate the relative position in parent container.