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

Merge "Pass NO_USER_ACTION activity option along to shell transition" into tm-qpr-dev am: 5f49a6b8cf

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

Change-Id: I48965ac8fd93401e3f793616aded9cacd7a6928d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Evan Rosky
2022-05-04 12:28:05 +00:00
committed by Automerger Merge Worker
parent 9c40e00b22 5f49a6b8cf
commit cfaacb2f23
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/wm/ActivityStarter.java
View File

@@ -1747,6 +1747,10 @@ class ActivityStarter {
// until after we launched to identify the relevant activity. // until after we launched to identify the relevant activity.
transitionController.setTransientLaunch(mLastStartActivityRecord, mPriorAboveTask); transitionController.setTransientLaunch(mLastStartActivityRecord, mPriorAboveTask);
} }
if (!mSupervisor.mUserLeaving) {
// no-user-leaving implies not entering PiP.
transitionController.setCanPipOnFinish(false /* canPipOnFinish */);
}
if (newTransition != null) { if (newTransition != null) {
transitionController.requestStartTransition(newTransition, transitionController.requestStartTransition(newTransition,
mTargetTask == null ? started.getTask() : mTargetTask, mTargetTask == null ? started.getTask() : mTargetTask,

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

@@ -544,6 +544,12 @@ class TransitionController {
} }
} }
/** @see Transition#setCanPipOnFinish */
void setCanPipOnFinish(boolean canPipOnFinish) {
if (mCollectingTransition == null) return;
mCollectingTransition.setCanPipOnFinish(canPipOnFinish);
}
void legacyDetachNavigationBarFromApp(@NonNull IBinder token) { void legacyDetachNavigationBarFromApp(@NonNull IBinder token) {
final Transition transition = Transition.fromBinder(token); final Transition transition = Transition.fromBinder(token);
if (transition == null || !mPlayingTransitions.contains(transition)) { if (transition == null || !mPlayingTransitions.contains(transition)) {