Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Hook-up nextTransitionForward to shell transitions" into sc-v2-dev

Browse Source
This commit is contained in:
Chris Li
2021-07-07 03:19:06 +00:00
committed by Android (Google) Code Review
parent ed5ea3b828 39b0bd2261
commit 5145c55ba1
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/wm/DisplayContent.java
View File

@@ -5026,6 +5026,12 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
/** Check if pending app transition is for activity / task launch. */ /** Check if pending app transition is for activity / task launch. */
boolean isNextTransitionForward() { 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) return mAppTransition.containsTransitRequest(TRANSIT_OPEN)
|| mAppTransition.containsTransitRequest(TRANSIT_TO_FRONT); || mAppTransition.containsTransitRequest(TRANSIT_TO_FRONT);
} }

8
services/core/java/com/android/server/wm/TransitionController.java
View File

@@ -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_TO_SHADE;
import static android.view.WindowManager.TRANSIT_FLAG_KEYGUARD_GOING_AWAY_WITH_WALLPAPER; 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_KEYGUARD_GOING_AWAY;
import static android.view.WindowManager.TRANSIT_NONE;
import static android.view.WindowManager.TRANSIT_OPEN; import static android.view.WindowManager.TRANSIT_OPEN;
import android.annotation.NonNull; import android.annotation.NonNull;
@@ -102,7 +103,7 @@ class TransitionController {
* Creates a transition. It can immediately collect participants. * Creates a transition. It can immediately collect participants.
*/ */
@NonNull @NonNull
Transition createTransition(@WindowManager.TransitionType int type, private Transition createTransition(@WindowManager.TransitionType int type,
@WindowManager.TransitionFlags int flags) { @WindowManager.TransitionFlags int flags) {
if (mTransitionPlayer == null) { if (mTransitionPlayer == null) {
throw new IllegalStateException("Shell Transitions not enabled"); throw new IllegalStateException("Shell Transitions not enabled");
@@ -181,6 +182,11 @@ class TransitionController {
return false; return false;
} }
@WindowManager.TransitionType
int getCollectingTransitionType() {
return mCollectingTransition != null ? mCollectingTransition.mType : TRANSIT_NONE;
}
/** /**
* @see #requestTransitionIfNeeded(int, int, WindowContainer, IRemoteTransition) * @see #requestTransitionIfNeeded(int, int, WindowContainer, IRemoteTransition)
*/ */