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

Commit 7fd880f4 authored by Chris Li's avatar Chris Li Committed by Automerger Merge Worker
Browse files

Merge "Hook-up nextTransitionForward to shell transitions" into sc-v2-dev am: 5145c55b 

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

Change-Id: I6fdbe95c13143d2b3886dadf5fa88426df2af3ac
parents 4bede49b 5145c55b

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

+6 −0
Original line number Diff line number Diff line
@@ -5026,6 +5026,12 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 


    /** Check if pending app transition is for activity / task launch. */

    boolean isNextTransitionForward() {

        // TODO(b/191375840): decouple "forwardness" from transition system.

        if (mAtmService.getTransitionController().isShellTransitionsEnabled()) {

            @WindowManager.TransitionType int type =

                    mAtmService.getTransitionController().getCollectingTransitionType();

            return type == TRANSIT_OPEN || type == TRANSIT_TO_FRONT;

        }

        return mAppTransition.containsTransitRequest(TRANSIT_OPEN)

                || mAppTransition.containsTransitRequest(TRANSIT_TO_FRONT);

    }

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

+7 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import static android.view.WindowManager.TRANSIT_FLAG_KEYGUARD_GOING_AWAY_SUBTLE 
import static android.view.WindowManager.TRANSIT_FLAG_KEYGUARD_GOING_AWAY_TO_SHADE;

import static android.view.WindowManager.TRANSIT_FLAG_KEYGUARD_GOING_AWAY_WITH_WALLPAPER;

import static android.view.WindowManager.TRANSIT_KEYGUARD_GOING_AWAY;

import static android.view.WindowManager.TRANSIT_NONE;

import static android.view.WindowManager.TRANSIT_OPEN;



import android.annotation.NonNull;
@@ -102,7 +103,7 @@ class TransitionController { 
     * Creates a transition. It can immediately collect participants.

     */

    @NonNull

    Transition createTransition(@WindowManager.TransitionType int type,

    private Transition createTransition(@WindowManager.TransitionType int type,

            @WindowManager.TransitionFlags int flags) {

        if (mTransitionPlayer == null) {

            throw new IllegalStateException("Shell Transitions not enabled");
@@ -181,6 +182,11 @@ class TransitionController { 
        return false;

    }



    @WindowManager.TransitionType

    int getCollectingTransitionType() {

        return mCollectingTransition != null ? mCollectingTransition.mType : TRANSIT_NONE;

    }



    /**

     * @see #requestTransitionIfNeeded(int, int, WindowContainer, IRemoteTransition)

     */