summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2018-10-16 20:23:46 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2018-10-16 20:23:46 +0000
commit6c47c99a0047786f2abcd1dbe0c3da835866b62e (patch)
treef51225fc48404f2b92b57f6c6a0e7e90bf1becea
parent94d3f53237b26957d0bb4f177ecb6093cb912bf5 (diff)
parentf2e0a9e3f29904bdc17f753a7b6e2f620f576079 (diff)
Merge "Only skip stacks behind home when not in multi-window mode."
-rw-r--r--services/core/java/com/android/server/wm/DisplayContent.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java
index 642f57814c61..d8fd198fe143 100644
--- a/services/core/java/com/android/server/wm/DisplayContent.java
+++ b/services/core/java/com/android/server/wm/DisplayContent.java
@@ -2077,9 +2077,9 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo
int taskForTapOutside(int x, int y) {
for (int stackNdx = mTaskStackContainers.getChildCount() - 1; stackNdx >= 0; --stackNdx) {
final TaskStack stack = mTaskStackContainers.getChildAt(stackNdx);
- if (stack.isActivityTypeHome()) {
+ if (stack.isActivityTypeHome() && !stack.inMultiWindowMode()) {
// We skip not only home stack, but also everything behind home because user can't
- // see them.
+ // see them when home stack is isn't in multi-window mode.
break;
}
final int taskId = stack.taskIdFromPoint(x, y);