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

Merge "Disable auto-enter PIP when launching an assistant activity" into oc-dr1-dev

Browse Source
This commit is contained in:
Winson Chung
2017-07-06 03:35:50 +00:00
committed by Android (Google) Code Review
parent 6258aae548 4aede8abc6
commit 7ee9ec59d8
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/am/ActivityStack.java
View File

@@ -2882,8 +2882,9 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai
} else {
// If a new task is being launched, then mark the existing top activity as
// supporting picture-in-picture while pausing
if (focusedTopActivity != null &&
focusedTopActivity.getStack().getStackId() != PINNED_STACK_ID) {
if (focusedTopActivity != null
&& focusedTopActivity.getStackId() != PINNED_STACK_ID
&& r.getStackId() != ASSISTANT_STACK_ID) {
focusedTopActivity.supportsPictureInPictureWhilePausing = true;
}
transit = TRANSIT_TASK_OPEN;
@@ -4549,7 +4550,8 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai
}
// If a new task is moved to the front, then mark the existing top activity as supporting
// picture-in-picture while paused
if (topActivity != null && topActivity.getStack().getStackId() != PINNED_STACK_ID) {
if (topActivity != null && topActivity.getStackId() != PINNED_STACK_ID
&& tr.getStackId() != ASSISTANT_STACK_ID) {
topActivity.supportsPictureInPictureWhilePausing = true;
}