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

Merge "Ensure transparent assistant works with PiP" into oc-dr1-dev

Browse Source
This commit is contained in:
Winson Chung
2017-07-12 00:01:48 +00:00
committed by Android (Google) Code Review
parent 81977b8929 dd7593ac21
commit 8d10791f5b
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1690,14 +1690,20 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai
}
final int stackBehindTopId = (stackBehindTopIndex >= 0)
? mStacks.get(stackBehindTopIndex).mStackId : INVALID_STACK_ID;
if ((topStackId == DOCKED_STACK_ID || topStackId == PINNED_STACK_ID)
&& (stackIndex == stackBehindTopIndex
|| (stackBehindTopId == DOCKED_STACK_ID
&& stackIndex == stackBehindTopIndex - 1))) {
// Stacks directly behind the docked or pinned stack are always visible.
// Also this stack is visible if behind docked stack and the docked stack is behind the
// top-most pinned stack
return STACK_VISIBLE;
if (topStackId == DOCKED_STACK_ID || StackId.isAlwaysOnTop(topStackId)) {
if (stackIndex == stackBehindTopIndex) {
// Stacks directly behind the docked or pinned stack are always visible.
return STACK_VISIBLE;
} else if (StackId.isAlwaysOnTop(topStackId) && stackIndex == stackBehindTopIndex - 1) {
// Otherwise, this stack can also be visible if it is directly behind a docked stack
// or translucent assistant stack behind an always-on-top top-most stack
if (stackBehindTopId == DOCKED_STACK_ID) {
return STACK_VISIBLE;
} else if (stackBehindTopId == ASSISTANT_STACK_ID) {
return mStacks.get(stackBehindTopIndex).isStackTranslucent(starting, mStackId)
? STACK_VISIBLE : STACK_INVISIBLE;
}
}
}
if (StackId.isBackdropToTranslucentActivity(topStackId)