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

Merge "Prevent non-fullscreen activities from triggering auto-enter PiP" into oc-dr1-dev

Browse Source
This commit is contained in:
Winson Chung
2017-07-12 22:04:43 +00:00
committed by Android (Google) Code Review
parent 3d0a74a9e4 942a85c6d6
commit d24ed58bc2
2 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2887,10 +2887,13 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai
transit = TRANSIT_TASK_OPEN_BEHIND; transit = TRANSIT_TASK_OPEN_BEHIND;
} else { } else {
// If a new task is being launched, then mark the existing top activity as // If a new task is being launched, then mark the existing top activity as
// supporting picture-in-picture while pausing // supporting picture-in-picture while pausing only if the starting activity
// would not be considered an overlay on top of the current activity
// (eg. not fullscreen, or the assistant)
if (focusedTopActivity != null if (focusedTopActivity != null
&& focusedTopActivity.getStackId() != PINNED_STACK_ID && focusedTopActivity.getStackId() != PINNED_STACK_ID
&& r.getStackId() != ASSISTANT_STACK_ID) { && r.getStackId() != ASSISTANT_STACK_ID
&& r.fullscreen) {
focusedTopActivity.supportsPictureInPictureWhilePausing = true; focusedTopActivity.supportsPictureInPictureWhilePausing = true;
} }
transit = TRANSIT_TASK_OPEN; transit = TRANSIT_TASK_OPEN;
@@ -4555,9 +4558,10 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai
updateTransitLocked(TRANSIT_TASK_TO_FRONT, options); updateTransitLocked(TRANSIT_TASK_TO_FRONT, options);
} }
// If a new task is moved to the front, then mark the existing top activity as supporting // If a new task is moved to the front, then mark the existing top activity as supporting
// picture-in-picture while paused // picture-in-picture while paused only if the task would not be considered an oerlay on top
// of the current activity (eg. not fullscreen, or the assistant)
if (topActivity != null && topActivity.getStackId() != PINNED_STACK_ID if (topActivity != null && topActivity.getStackId() != PINNED_STACK_ID
&& tr.getStackId() != ASSISTANT_STACK_ID) { && tr.getStackId() != ASSISTANT_STACK_ID && tr.containsOnlyFullscreenActivities()) {
topActivity.supportsPictureInPictureWhilePausing = true; topActivity.supportsPictureInPictureWhilePausing = true;
} }

13
services/core/java/com/android/server/am/TaskRecord.java
View File

@@ -1112,6 +1112,19 @@ final class TaskRecord extends ConfigurationContainer implements TaskWindowConta
return intent != null ? intent : affinityIntent; return intent != null ? intent : affinityIntent;
} }
/**
* @return Whether there are only fullscreen activities in this task.
*/
boolean containsOnlyFullscreenActivities() {
for (int i = 0; i < mActivities.size(); i++) {
final ActivityRecord r = mActivities.get(i);
if (!r.finishing && !r.fullscreen) {
return false;
}
}
return true;
}
/** Returns the first non-finishing activity from the root. */ /** Returns the first non-finishing activity from the root. */
ActivityRecord getRootActivity() { ActivityRecord getRootActivity() {
for (int i = 0; i < mActivities.size(); i++) { for (int i = 0; i < mActivities.size(); i++) {