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

Commit 35abba49 authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

Merge "Skip immediate hiding from finishTransition" into tm-qpr-dev am: d62ad11b am: 298d7c19 

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



Change-Id: Ia73146540f938f4d72560f7234a6d634275ffdb6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f6657fda 298d7c19

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

+8 −2
Original line number Diff line number Diff line
@@ -670,7 +670,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
    private boolean mCurrentLaunchCanTurnScreenOn = true;



    /** Whether our surface was set to be showing in the last call to {@link #prepareSurfaces} */

    private boolean mLastSurfaceShowing = true;

    private boolean mLastSurfaceShowing;



    /**

     * The activity is opaque and fills the entire space of this task.
@@ -5470,7 +5470,8 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        // no animation but there will still be a transition set.

        // We still need to delay hiding the surface such that it

        // can be synchronized with showing the next surface in the transition.

        if (!isVisible() && !delayed && !displayContent.mAppTransition.isTransitionSet()) {

        if (!usingShellTransitions && !isVisible() && !delayed

                && !displayContent.mAppTransition.isTransitionSet()) {

            SurfaceControl.openTransaction();

            try {

                forAllWindows(win -> {
@@ -7399,6 +7400,11 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        }

    }



    @Override

    boolean showSurfaceOnCreation() {

        return false;

    }



    @Override

    void prepareSurfaces() {

        final boolean show = isVisible() || isAnimating(PARENTS,

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

+0 −8
Original line number Diff line number Diff line
@@ -642,7 +642,6 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< 
        if (showSurfaceOnCreation()) {

            getSyncTransaction().show(mSurfaceControl);

        }

        onSurfaceShown(getSyncTransaction());

        updateSurfacePositionNonOrganized();

        if (mLastMagnificationSpec != null) {

            applyMagnificationSpec(getSyncTransaction(), mLastMagnificationSpec);
@@ -697,13 +696,6 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< 
        scheduleAnimation();

    }



    /**

     * Called when the surface is shown for the first time.

     */

    void onSurfaceShown(Transaction t) {

        // do nothing

    }



    // Temp. holders for a chain of containers we are currently processing.

    private final LinkedList<WindowContainer> mTmpChain1 = new LinkedList<>();

    private final LinkedList<WindowContainer> mTmpChain2 = new LinkedList<>();